diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0e46944a436..572cb9d04fd 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -303,6 +303,13 @@ class account_bank_statement(osv.osv):
                                 _('Ledger Posting line "%s" is not valid') % line.name)
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
+                    ## Search if move has already a partial reconciliation
+                    previous_partial = False
+                    for line_reconcile_move in move.reconcile_id.line_ids:
+                        if line_reconcile_move.reconcile_partial_id:
+                            previous_partial = True
+                            break
+                    ##
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
                     #try:
                     if abs(move.reconcile_amount-move.amount)<0.0001:
@@ -312,8 +319,14 @@ class account_bank_statement(osv.osv):
                         for entry in move.reconcile_id.line_new_ids:
                             writeoff_acc_id = entry.account_id.id
                             break
-
-                        account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+                        ## If we have already a partial reconciliation
+                        ## We need to make a partial reconciliation
+                        ## To add this amount to previous paid amount
+                        if previous_partial:
+                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                        ## If it's the first reconciliation, we do a full reconciliation as regular
+                        else:
+                            account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
                     #except:
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index eea57359099..8380a19b411 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -26,16 +26,16 @@ from mx import DateTime
 from decimal import Decimal
 from tools.translate import _
 
-class singer_statement(osv.osv):
+class account_cashbox_line(osv.osv):
     
-    """ Singer Statements """
+    """ Cash Box Details """
     
-    _name = 'singer.statement'
-    _description = 'Statement'
+    _name = 'account.cashbox.line'
+    _description = 'CashBox Line'
 
     def _sub_total(self, cr, uid, ids, name, arg, context=None):
        
-        """ Calculates Sub total"
+        """ Calculates Sub total
         @param name: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
@@ -61,7 +61,7 @@ class singer_statement(osv.osv):
         'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
      }
-singer_statement()
+account_cashbox_line()
 
 class account_cash_statement(osv.osv):
     
@@ -157,22 +157,31 @@ class account_cash_statement(osv.osv):
             res[r] = round(res[r], 2)
         return res
     
+    def _get_company(self, cr, uid, ids, context={}):
+        user_pool = self.pool.get('res.users')
+        company_pool = self.pool.get('res.company')
+        user = user_pool.browse(cr, uid, uid, uid)
+        company_id = user.company_id and user.company_id.id
+        if not company_id:
+            company_id = company_pool.search(cr, uid, [])[0]
+        
+        return company_id
+        
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'balance_start': fields.function(_get_starting_balance, method=True, string='Opening Balance', type='float',digits=(16,2), help="Opening balance based on cashBox"),
+        'balance_start': fields.function(_get_starting_balance, store=True, method=True, string='Opening Balance', type='float',digits=(16,2), help="Opening balance based on cashBox"),
         'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('confirm', 'Confirm'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Cash Transaction", help="Total cash transactions"),
-        'date':fields.datetime("Open On"),
+        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date':fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, method=True, string='Balance', help="Closing balance based on transactions"),
-        'balance_end_cash': fields.function(_balance_end_cash, method=True, string='Balance', help="Closing balance based on cashBox"),
-        'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Opening Cashbox'),
-        'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Closing Cashbox'),
+        'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on transactions"),
+        'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
+        'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
+        'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
         'name': fields.char('Name', size=64, required=True, readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', required=False),
     }
@@ -181,7 +190,8 @@ class account_cash_statement(osv.osv):
         'name': lambda *a: '/',
         'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
         'journal_id': _default_journal_id,
-        'user_id': lambda self, cr, uid, context=None: uid
+        'user_id': lambda self, cr, uid, context=None: uid,
+        'company_id': _get_company
      }
 
     def create(self, cr, uid, vals, context=None):
@@ -205,7 +215,7 @@ class account_cash_statement(osv.osv):
         @return:  Dictionary of changed values
         """
         
-        cash_pool = self.pool.get('singer.statement')
+        cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
 
         res = {}
@@ -220,17 +230,30 @@ class account_cash_statement(osv.osv):
         
         res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
         return res
-
+    
+    def _equal_balance(self, cr, uid, ids, statement, context={}):
+        if statement.balance_end != statement.balance_end_cash:
+            return False
+        else:
+            return True
+    
+    def _user_allow(self, cr, uid, ids, statement, context={}):
+        return True
+    
     def button_open(self, cr, uid, ids, context=None):
         
         """ Changes statement state to Running.
         @return: True 
         """
-        cash_pool = self.pool.get('singer.statement')
+        cash_pool = self.pool.get('account.cashbox.line')
         statement_pool = self.pool.get('account.bank.statement')
 
         statement = statement_pool.browse(cr, uid, ids[0])
-        number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement')
+        
+        if not self._user_allow(cr, uid, ids, statement, context={}):
+            raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+        
+        number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
         
         if len(statement.starting_details_ids) > 0:
             sid = []
@@ -280,7 +303,7 @@ class account_cash_statement(osv.osv):
             if not st.state == 'open':
                 continue
                 
-            if st.balance_end != st.balance_end_cash:
+            if not self._equal_balance(cr, uid, ids, st, context):
                 raise osv.except_osv(_('Error !'), _('Cash balance is not matching with closing balance !'))
                 
             if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index fc10c58cc8f..7394fc54b7e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -205,7 +205,7 @@
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="stock_effects-object-colorize"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
                                 </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4067423cc3f..5946661136f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -12,12 +12,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscalyear">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                	<group>
+                    <field name="name"/>
+                    <field name="code"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="end_journal_period_id" groups="base.group_extended"/>
+                    </group>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
                         <form string="Period">
@@ -29,8 +31,8 @@
                         </form>
                     </field>
                     <separator colspan="4" string="States"/>
-                    <field name="state" select="1" readonly="1"/>
-                    <group col="2" colspan="2">
+                    <group>
+                    	<field name="state" select="1" readonly="1"/>
                         <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
                         <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
                     </group>
@@ -49,18 +51,40 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_fiscalyear_search" model="ir.ui.view">
+            <field name="name">account.fiscalyear.search</field>
+            <field name="model">account.fiscalyear</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Fiscalyear">
+                	<group>
+                		<filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
+                		<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                		<separator orientation="vertical"/>
+	                    <field name="code"/>
+	                    <field name="name"/>
+	                    <field name="state"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    	<filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_account_fiscalyear_form" model="ir.actions.act_window">
             <field name="name">Fiscal Years</field>
             <field name="res_model">account.fiscalyear</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting"/>
         <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
 
         <!--
-    Period
-    -->
+            Period
+        -->
+
         <record id="res_role_period" model="res.roles">
             <field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
         </record>
@@ -154,10 +178,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="user_type" select="1"/>
-                    <field name="type" select="1"/>
+                	<group col="10" colspan="4">
+                        <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+                        <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
+                        <separator orientation="vertical"/>
+	                    <field name="code"/>
+	                    <field name="name"/>
+	                    <field name="user_type"/>
+	                    <field name="type"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    	<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
+                    	<filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -181,6 +217,8 @@
                 <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="user_type" invisible="1"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
@@ -258,11 +296,34 @@
                 <tree string="Account Journal">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="type" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
-
+        <record id="view_account_journal_search" model="ir.ui.view">
+            <field name="name">account.journal.search</field>
+            <field name="model">account.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <tree string="Search Account Journal">
+                	<group>
+					<filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
+					<filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
+					<filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
+					<separator orientation="vertical"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
+                    <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                    </group>
+                </tree>
+            </field>
+        </record>
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -292,13 +353,13 @@
                                 <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                 <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Invoicing Data" colspan="4"/>
                                 <field name="invoice_sequence_id"/>
                                 <field name="group_invoice_lines"/>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -336,7 +397,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
-        
+
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.bank.statement.select</field>
             <field name="model">account.bank.statement</field>
@@ -345,16 +406,20 @@
                 <search string="Search Statement">
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
-                        <filter icon="terp-check" string="Poster" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                        <filter icon="terp-check" string="Posted" domain="[('state','=','confirm')]" help="Confirm confirm"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="date"/>
                         <field name="journal_id"/>
                     </group>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
-        
+
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -372,7 +437,29 @@
                 </tree>
             </field>
         </record>
-
+        <record id="view_bank_statement_search" model="ir.ui.view">
+            <field name="name">account.bank.statement.search</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Bank Statements">
+                	<group>
+                		<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                		<filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                		<separator orientation="vertical"/>
+	                    <field name="date"/>
+	                    <field name="name"/>
+	                    <field name="journal_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    	<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                    	<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                    	<filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -383,16 +470,10 @@
                         <field name="name" select="1"/>
                         <field name="date" select="1"/>
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-<!--                        <field name="currency"/>-->
                         <field name="period_id"/>
-<!--                        <group colspan="2" col="3">-->
-    <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
-    <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-<!--                            <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>-->
-<!--                        </group>-->
                         <field name="balance_start"/>
                     <field name="balance_end_real"/>
-                    </group>                    
+                    </group>
                     <notebook colspan="4">
                         <page string="Transaction">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -450,7 +531,7 @@
             <field name="name">Draft statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>
         </record>
@@ -621,7 +702,8 @@
                     <field name="sum"/>
                     <field name="sum_period"/>
                     <newline/>
-                    <field colspan="4" name="info"/>
+                    <separator string="Description" colspan="4"/>
+                    <field colspan="4" name="info" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -649,9 +731,30 @@
                     <field name="name"/>
                     <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
+                    <field name="tax_group" invisible="1"/>
                 </tree>
             </field>
         </record>
+        <record id="view_account_tax_search" model="ir.ui.view">
+            <field name="name">account.tax.search</field>
+            <field name="model">account.tax</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Taxes">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
+                        <filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Tax Group" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'tax_group'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="view_tax_form" model="ir.ui.view">
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
@@ -715,7 +818,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
-        
+
         <record id="action_tax_code_tree" model="ir.actions.act_window">
             <field name="name">Chart of Taxes</field>
             <field name="res_model">account.tax.code</field>
@@ -729,7 +832,7 @@
             parent="menu_finance_charts"
             sequence="12"/>
 <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/-->
-        
+
         <!--
     Entries lines
     -->
@@ -1046,6 +1149,23 @@
             </field>
         </record>
 
+
+       <record id="action_move_journal_line" model="ir.actions.act_window">
+            <field name="name">Journal Entries</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+        </record>
+
+        <menuitem
+            icon="STOCK_JUSTIFY_FILL"
+            action="action_move_journal_line"
+            id="menu_action_move_journal_line_form"
+            parent="account.menu_finance_entries"
+            sequence="5"/>
+
         <record id="action_move_line_form" model="ir.actions.act_window">
             <field name="name">Entries</field>
             <field name="type">ir.actions.act_window</field>
@@ -1054,7 +1174,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        
+
         <act_window
             domain="[('move_id','=',active_id)]"
             id="act_account_move_to_account_move_line_open"
@@ -1062,7 +1182,7 @@
             context="{'move_id':active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
-            
+
         <record id="action_move_to_review" model="ir.actions.act_window">
             <field name="name">Journal Entries to Review</field>
             <field name="type">ir.actions.act_window</field>
@@ -1077,7 +1197,7 @@
 <!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Journal Vouchers</field>
+            <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1085,8 +1205,8 @@
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
 
-<!--        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
-        
+        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
+
         <record id="action_account_moves_sale" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -1132,18 +1252,18 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id="action_move_line_search_view4" model="ir.actions.act_window">
-            <field name="name">Checks Register</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
-        </record>
-        
-        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
+<!--        <record id="action_move_line_search_view4" model="ir.actions.act_window">-->
+<!--            <field name="name">Cheque Register</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.move.line</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="view_id" ref="view_move_line_tree"/>-->
+<!--            <field name="search_view_id" ref="view_account_move_line_filter"/>-->
+<!--            <field name="domain">[('journal_id.type', '=', 'bank')]</field>-->
+<!--        </record>-->
+<!--        -->
+<!--        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>-->
 
 <!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
@@ -1152,7 +1272,7 @@
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
  -->
 
-        
+
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
@@ -1346,7 +1466,7 @@
                     <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
-                    <group col="1" colspan="4"> 
+                    <group col="1" colspan="4">
                         <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                     </group>
                 </form>
@@ -1419,12 +1539,32 @@
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
                     <separator colspan="4" string="Description on invoices"/>
-                    <field colspan="4" name="note"/>
+                    <field colspan="4" name="note" nolabel="1"/>
                     <separator colspan="4" string="Computation"/>
-                    <field colspan="4" name="line_ids"/>
+                    <field colspan="4" name="line_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
+<!--        <record id="view_account_move_line_filter" model="ir.ui.view">-->
+<!--            <field name="name">Payment Terms</field>-->
+<!--            <field name="model">account.payment.term</field>-->
+<!--            <field name="type">search</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <search string="Search Payment Terms">-->
+<!--                    <group col='10' colspan='4'>-->
+<!--                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>-->
+<!--                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>-->
+<!--                        <separator orientation="vertical"/>-->
+<!--                        <field name="date" select='1'/>-->
+<!--                        <field name="account_id" select='1'/>-->
+<!--                        <field name="partner_id" select='1'>-->
+<!--                        	<filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>-->
+<!--                        </field>-->
+<!--                        <field name="balance" string="Debit/Credit" select='1'/>-->
+<!--                    </group>-->
+<!--                </search>-->
+<!--            </field>-->
+<!--        </record>-->
         <record id="action_payment_term_form" model="ir.actions.act_window">
             <field name="name">Payment Terms</field>
             <field name="res_model">account.payment.term</field>
@@ -1616,13 +1756,14 @@
         <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
-            <field name="name">Account Add wizard</field>
+            <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Add">
-                    <separator col="4" colspan="4" string="Select the common parent for the accounts"/>
+                <form string="Create Account">
+                    <separator col="4" colspan="4" string="Create an Account based on this template"/>
                     <field name="cparent_id"/>
+                    <newline/>
                     <group col="2" colspan="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
@@ -1632,7 +1773,8 @@
         </record>
 
         <act_window domain="[]" id="action_account_addtmpl_wizard_form"
-            name="Add account Wizard"
+            name="Create Account"
+            target="new"
             res_model="account.addtmpl.wizard"
             context="{'tmpl_ids': active_id}"
             src_model="account.account.template"
@@ -1665,16 +1807,17 @@
                     <notebook>
                         <page string="General Information">
                             <field name="name"/>
-                            <field name="code" select="1"/>
+                            <field name="code"/>
                             <newline/>
-                            <field name="parent_id" select="1"/>
+                            <field name="parent_id"/>
                             <field name="shortcut"/>
-                            <field name="type" select="1"/>
-                            <field name="user_type" select="1"/>
+                            <field name="type"/>
+                            <field name="user_type"/>
 
                             <field name="currency_id"/>
                             <field name="reconcile"/>
-                            <field name="tax_ids" colspan="4"/>
+                            <separator string="Default taxes" colspan="4"/>
+                            <field name="tax_ids" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -1692,15 +1835,41 @@
                 <tree string="Account Template">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="type" invisible="1"/>
+                    <field name="user_type" invisible="1"/>
                 </tree>
             </field>
         </record>
 
+        <record id="view_account_template_search" model="ir.ui.view">
+            <field name="name">account.account.template.search</field>
+            <field name="model">account.account.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Account Templates">
+                	<group>
+                		<filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                     	<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                     	<separator orientation="vertical"/>
+                     	<field name="code"/>
+                        <field name="parent_id"/>
+                        <field name="type"/>
+                        <field name="user_type"/>
+                	</group>
+                	<newline/>
+                	<group expand="0" string="Group By...">
+                        <filter string="Internal Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_account_template_form" model="ir.actions.act_window">
             <field name="name">Account Templates</field>
             <field name="res_model">account.account.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
 
 
@@ -1714,21 +1883,50 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Chart of Accounts Template">
-                    <field name="name" select="1"/>
-                    <field name="account_root_id" select="1"/>
-                    <field name="bank_account_view_id" select="1"/>
+                	<group>
+                    <field name="name"/>
+                    <field name="account_root_id"/>
+                    <field name="bank_account_view_id"/>
                     <field name="tax_code_root_id"/>
-                    <field name="tax_template_ids" colspan="4" readonly="1" />
+                    </group>
+                    <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
+                    <group>
                     <field name="property_account_receivable"/>
                     <field name="property_account_payable"/>
                     <field name="property_account_expense_categ" />
                     <field name="property_account_income_categ"/>
                     <field name="property_account_expense"/>
                     <field name="property_account_income"/>
+                    </group>
                 </form>
             </field>
         </record>
+        <record id="view_account_chart_template_seacrh" model="ir.ui.view">
+            <field name="name">account.chart.template.search</field>
+            <field name="model">account.chart.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Chart of Account Templates">
+                	  <group>
+                	  	<field name="name"/>
+    	                <field name="account_root_id"/>
+	                    <field name="bank_account_view_id"/>
+                	  </group>
+                	  <newline/>
+                      <group expand="0" string="Group By...">
+                        <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
+                        <filter string="Bank Account" icon="terp-folder-blue" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
+                        <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
+						<separator orientation="vertical"/>
+                        <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
+                        <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
+                      </group>
+                </search>
+            </field>
+        </record>
         <record id="view_account_chart_template_tree" model="ir.ui.view">
             <field name="name">account.chart.template.tree</field>
             <field name="model">account.chart.template</field>
@@ -1739,6 +1937,10 @@
                     <field name="account_root_id"/>
                     <field name="tax_code_root_id"/>
                     <field name="bank_account_view_id"/>
+                    <field name="property_account_receivable" invisible="1"/>
+                    <field name="property_account_payable" invisible="1"/>
+                    <field name="property_account_expense_categ" invisible="1"/>
+                    <field name="property_account_income_categ" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -1746,7 +1948,7 @@
             <field name="name">Chart of Accounts Templates</field>
             <field name="res_model">account.chart.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
 
         <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
@@ -1760,11 +1962,11 @@
             <field name="arch" type="xml">
                 <form string="Account Tax Template">
                     <group colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="description" select="1"/>
+                        <field name="name"/>
+                        <field name="description"/>
                         <newline/>
-                        <field name="chart_template_id" select="1"/>
-                        <field name="tax_group" select="1"/>
+                        <field name="chart_template_id"/>
+                        <field name="tax_group"/>
                         <field name="type"/>
                         <field name="type_tax_use"/>
                     </group>
@@ -1818,6 +2020,27 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_tax_template_search" model="ir.ui.view">
+            <field name="name">account.tax.template.search</field>
+            <field name="model">account.tax.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Tax Templates">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
+                        <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
+                        <filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                        <field name="chart_template_id"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_account_tax_template_form" model="ir.actions.act_window">
             <field name="name">Tax Templates</field>
             <field name="res_model">account.tax.template</field>
@@ -1837,10 +2060,30 @@
                 <tree string="Account Tax Code Template" toolbar="1">
                     <field name="name"/>
                     <field name="code"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
 
+		<record id="view_tax_code_template_search" model="ir.ui.view">
+            <field name="name">account.tax.code.template.search</field>
+            <field name="model">account.tax.code.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search tax template">
+                	<group>
+	                	<field name="name"/>
+	                    <field name="code"/>
+	                    <field name="parent_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    	<filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="view_tax_code_template_form" model="ir.ui.view">
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
@@ -1852,7 +2095,8 @@
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
                     <newline/>
-                    <field colspan="4" name="info"/>
+                    <separator string="Description" colspan="4"/>
+                    <field colspan="4" name="info" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -1861,7 +2105,7 @@
             <field name="name">Tax Code Templates</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
         <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
@@ -1949,7 +2193,7 @@
                     <field name="name" select="1"/>
                     <field name="chart_template_id"/>
                     <newline/>
-                    <field name="tax_ids" colspan="4">
+                    <field name="tax_ids" colspan="4" nolabel="1">
                         <tree string="Taxes Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -1959,7 +2203,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4">
+                    <field name="account_ids" colspan="4" nolabel="1">
                         <tree string="Accounts Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -2003,14 +2247,14 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        
+
         <menuitem
-            icon="STOCK_JUSTIFY_FILL" 
-            action="action_move_journal_line" 
-            id="menu_action_move_journal_line_form" 
-            parent="account.menu_finance_entries" 
+            icon="STOCK_JUSTIFY_FILL"
+            action="action_move_journal_line"
+            id="menu_action_move_journal_line_form"
+            parent="account.menu_finance_entries"
             sequence="5"/>
-        
+
         <record id="action_account_moves_all" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -2020,10 +2264,10 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
-        <menuitem 
-            action="action_account_moves_all" 
-            icon="STOCK_JUSTIFY_FILL" 
-            id="menu_eaction_account_moves_all" 
+        <menuitem
+            action="action_account_moves_all"
+            icon="STOCK_JUSTIFY_FILL"
+            id="menu_eaction_account_moves_all"
             parent="account.menu_finance_entries"
             sequence="4"
         />
@@ -2050,7 +2294,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_bank_statement_form2" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -2065,7 +2309,7 @@
                         <field name="period_id" select="1"/>
                         <field name="balance_end_real"/>
                     </group>
-                    
+
                     <notebook colspan="4">
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -2081,6 +2325,19 @@
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field invisible="1" name="reconcile_amount"/>
                                 </tree>
+                                <form string="Statement lines">
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
+                                    <field name="ref"/>
+                                    <field name="sequence"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
                             </field>
                         </page>
                         <page string="Cash Box">
@@ -2166,6 +2423,6 @@
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 0621946938e..6738c7a7d37 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -48,10 +48,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-        
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
-            groups="account.group_account_manager"/>
-        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
+
+        <menuitem icon="terp-graph" id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
+        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/account/company.py b/addons/account/company.py
index 8ea9c80f694..613c702a46e 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -28,7 +28,7 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': lambda *a: 'Would your payment have been carried \
+        'overdue_msg': 'Would your payment have been carried \
 out after this mail was sent, please consider the present one as \
 void. Do not hesitate to contact our accounting department'
     }
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 37225273e03..308de35e316 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -14,31 +14,48 @@
         <record id="account_type_asset" model="account.account.type">
             <field name="name">Asset</field>
             <field name="code">asset</field>
+            <field name="report_type">asset</field>
             <field name="close_method">balance</field>
         </record>
+        <record id="account_type_receivable" model="account.account.type">
+            <field name="name">Receivable</field>
+            <field name="code">receivable</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">unreconciled</field>
+        </record>
         <record id="account_type_liability" model="account.account.type">
-            <field name="name">Liability</field> 
+            <field name="name">Liability</field>
             <field name="code">liability</field>
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
+        <record id="account_type_payable" model="account.account.type">
+            <field name="name">Payable</field>
+            <field name="code">payable</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">unreconciled</field>
+        </record>
+        <record id="account_type_income" model="account.account.type">
+            <field name="name">Income</field>
+            <field name="code">income</field>
+            <field name="report_type">income</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="account_type_expense" model="account.account.type">
+            <field name="name">Expense</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">none</field>
+        </record>
         <record id="account_type_cash_equity" model="account.account.type">
-            <field name="name">Equity</field> 
+            <field name="name">Equity</field>
             <field name="code">equity</field>
             <field name="close_method">balance</field>
         </record>
-        <record id="account_type_income" model="account.account.type">
-            <field name="name">Income</field> 
-            <field name="code">income</field>
-            <field name="close_method">unreconciled</field>
-        </record>
-        <record id="account_type_expense" model="account.account.type">
-            <field name="name">Expense</field> 
-            <field name="code">expense</field>
-            <field name="close_method">unreconciled</field>
-        </record>
         <record id="account_type_cash_moves" model="account.account.type">
-            <field name="name">Cash</field> 
+            <field name="name">Cash</field>
             <field name="code">cash</field>
+            <field name="report_type">asset</field>
             <field name="close_method">balance</field>
         </record>
 
@@ -65,7 +82,7 @@ your own accounts.
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="account_type_receivable"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -75,12 +92,12 @@ your own chart of account.
         </record>
         <record id="a_pay" model="account.account">
             <field name="name">Main Payable</field>
-            <field name="code">x 440000</field>
+            <field name="code">x 44000</field>
             <field name="type">payable</field>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="account_type_payable"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -90,7 +107,7 @@ your own chart of account.
         </record>
         <record id="cash" model="account.account">
             <field name="name">Petty Cash</field>
-            <field name="code">x 570000</field>
+            <field name="code">x 57000</field>
             <field name="type">other</field>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
@@ -104,7 +121,7 @@ your own chart of account.
         </record>
         <record id="a_expense" model="account.account">
             <field name="name">Products Purchase</field>
-            <field name="code">x 600000</field>
+            <field name="code">x 60000</field>
             <field name="type">other</field>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
@@ -118,11 +135,11 @@ your own chart of account.
         </record>
         <record id="a_sale" model="account.account">
             <field name="name">Products Sales</field>
-            <field name="code">x 701000</field>
+            <field name="code">x 70000</field>
             <field name="type">other</field>
             <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="user_type" ref="account_type_income"/>
             <field name="company_id" ref="base.main_company"/>
+            <field name="user_type" ref="account_type_income"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -162,6 +179,7 @@ your own chart of account.
             <field name="type">sale</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -169,7 +187,7 @@ your own chart of account.
         <record id="refund_sales_journal" model="account.journal">
             <field name="name">x Sales Credit Note Journal</field>
             <field name="code">SCNJ</field>
-            <field name="type">sale</field>
+            <field name="type">sale_refund</field>
             <field name="refund_journal">True</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
@@ -184,6 +202,7 @@ your own chart of account.
             <field name="type">purchase</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
@@ -191,7 +210,7 @@ your own chart of account.
         <record id="refund_expenses_journal" model="account.journal">
             <field name="name">x Expenses Credit Notes Journal</field>
             <field name="code">ECNJ</field>
-            <field name="type">purchase</field>
+            <field name="type">purchase_refund</field>
             <field name="refund_journal">True</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
@@ -224,17 +243,17 @@ your own chart of account.
         <!--
 		Product income and expense accounts, default parameters
 	-->
-        
+
         <record id="property_account_expense_prd" model="ir.property">
             <field name="name">property_account_expense</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
-            <field eval="False" name="value"/>
+            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="property_account_income_prd" model="ir.property">
             <field name="name">property_account_income</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
-            <field eval="False" name="value"/>
+            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="property_account_expense_categ" model="ir.property">
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index ef00056ee8e..e82ded52779 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -5794,3 +5794,332 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 1758157cdab..40a9a61c0a3 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr ""
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1394,8 +1354,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2826,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2955,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2978,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +3004,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +3014,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3035,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3063,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3103,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3121,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3148,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3339,8 +3225,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3238,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3275,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3291,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,15 +3316,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3358,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3434,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3490,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3560,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3580,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3618,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3642,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3763,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3949,20 +3817,15 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3856,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3948,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3969,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3996,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4192,8 +4049,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4284,8 +4140,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4311,14 +4166,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4339,8 +4192,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4210,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4270,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4462,8 +4311,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4580,11 +4428,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4525,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4761,8 +4604,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4789,8 +4631,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4642,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4818,8 +4658,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4834,8 +4673,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,8 +4691,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4864,22 +4701,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4941,8 +4772,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4803,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5024,14 +4853,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5072,8 +4899,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5098,9 +4924,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5117,8 +4941,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5169,8 +4992,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5216,12 +5038,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5248,8 +5067,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5103,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5316,8 +5128,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5151,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5385,8 +5195,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,8 +5206,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5406,12 +5214,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5455,11 +5260,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5498,8 +5300,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5592,15 +5393,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5644,8 +5441,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,8 +5523,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5768,8 +5563,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5816,10 +5610,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5645,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5703,338 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 0e9861376ac..23792613cb9 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Несъгласувани стойности"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Основен код"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Остатък"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Премесетване на избрания ред"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Етикет на запис"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Сума за периода"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Изчисли кода (if type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Ред от запис на сметка"
 
@@ -232,12 +226,9 @@ msgstr "Повтарящи се записи"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Сума"
@@ -278,8 +269,7 @@ msgstr ""
 "набиране във всеки дневник."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -293,14 +283,12 @@ msgstr ""
 "например 50% сега и 50% след месец."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Фиксиран"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Просрочени плащания"
 
@@ -316,8 +304,7 @@ msgid "Select period"
 msgstr "Избери период"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Произход"
 
@@ -347,8 +334,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Данък"
@@ -367,14 +353,12 @@ msgid "Analytic Account"
 msgstr "Аналитична сметка"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Данък върху подчинени"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Име на дневник"
@@ -442,11 +426,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Състояние"
@@ -458,8 +439,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Неплатени обезщетения на доставчици"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Специалини изчисления"
 
@@ -481,10 +461,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Отпратка"
@@ -675,8 +653,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -708,8 +685,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -741,8 +717,7 @@ msgid "Field Name"
 msgstr "Име на поле"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Знак за родител"
 
@@ -752,8 +727,7 @@ msgid "End of Year Entries Journal"
 msgstr "Днвеник за записи в края на годината"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -773,12 +747,9 @@ msgid "Move Lines Created."
 msgstr "Създадени редове за преместване"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Състояние"
 
@@ -931,10 +902,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Количество"
@@ -977,16 +946,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1008,8 +974,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1133,8 +1098,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Единична цена"
 
@@ -1287,8 +1251,7 @@ msgid "Not reconciled transactions"
 msgstr "Няма обединяващи транзакции"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1310,8 +1273,7 @@ msgid "Write-Off account"
 msgstr "Сметка за отписвания"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Модел"
 
@@ -1337,11 +1299,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Изглед"
 
@@ -1412,8 +1372,7 @@ msgstr "Видове сметки"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1429,8 +1388,7 @@ msgid "Journal"
 msgstr "Дневник"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1456,8 +1414,7 @@ msgid "Statement reconcile line"
 msgstr "Ред от отчет за приравняване"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Запазете празно за да изпозвате сметката за приходи"
 
@@ -1584,8 +1541,7 @@ msgid "Account n°"
 msgstr "Сметка n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Запазете празно за да изпозвате сметката за разходи"
 
@@ -1595,8 +1551,7 @@ msgid "Account to reconcile"
 msgstr "Сметка за приравняване"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Препратки към партньора"
@@ -1608,14 +1563,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Редове на абонамент"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1779,8 +1732,7 @@ msgid "Period length (days)"
 msgstr "Продължителност на период (дни)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
@@ -1791,8 +1743,7 @@ msgid "Charts"
 msgstr "Диаграми"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1866,12 +1817,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Вид"
 
@@ -2019,8 +1967,7 @@ msgid "Journal-Period Name"
 msgstr "Име на период на дневник"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Име на условие за данък"
 
@@ -2035,8 +1982,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2109,10 +2055,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Валута"
@@ -2150,8 +2094,7 @@ msgid "Analytic Entry"
 msgstr "Аналитичен запис"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2203,8 +2146,7 @@ msgid "Detail"
 msgstr "Подробно"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Консолидация"
 
@@ -2270,13 +2212,9 @@ msgid "Date Invoiced"
 msgstr "Дата на фактуриране"
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ако е празно всички периоди"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2299,21 +2237,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Дата"
@@ -2330,8 +2263,7 @@ msgid "Unreconcile"
 msgstr "Връщане приравняване"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Вид данък"
 
@@ -2341,8 +2273,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Потребител"
 
@@ -2428,8 +2359,7 @@ msgid "Date End"
 msgstr "Крайна дата"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2437,8 +2367,7 @@ msgid "Entry Lines"
 msgstr "Редове на запис"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Приложим код (if type=code)"
 
@@ -2527,11 +2456,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2550,8 +2477,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -2561,10 +2487,8 @@ msgid "Acc. Type Name"
 msgstr "Име на вида на сметката"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2578,8 +2502,7 @@ msgid "Litigation"
 msgstr "Жалба"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Информация"
@@ -2689,8 +2612,7 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2757,17 +2679,13 @@ msgid "Invoice Reference"
 msgstr "Отпратка на фактура"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Име"
@@ -2807,8 +2725,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2901,16 +2818,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2931,9 +2843,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Счетоводство"
 
@@ -2978,10 +2888,8 @@ msgid "Centralisation"
 msgstr "Централизация"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Код на данък"
@@ -3024,14 +2932,12 @@ msgstr ""
 "условията за плащане на партньора."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Ситуация"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Документ"
 
@@ -3069,8 +2975,7 @@ msgid "Cancel selected invoices"
 msgstr "Отказа на избраните фактури"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3093,28 +2998,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Пращане в проект"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Платим"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Основа"
 
@@ -3124,8 +3024,7 @@ msgid "Model Name"
 msgstr "Име на модела"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3135,15 +3034,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Проверка"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Легенда"
 
@@ -3158,17 +3055,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3189,12 +3083,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Бележки"
@@ -3207,8 +3098,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3233,21 +3123,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Код"
 
@@ -3257,8 +3141,7 @@ msgid "Financial Management"
 msgstr "Управление на финанси"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Няма"
@@ -3285,8 +3168,7 @@ msgid "Additionnal Information"
 msgstr "Допълнителна информация"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Име на данък"
@@ -3363,8 +3245,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3377,8 +3258,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3417,8 +3297,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Създаване"
@@ -3434,8 +3313,7 @@ msgid "Invoice line"
 msgstr "Ред от фактура"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Пряк път"
 
@@ -3462,15 +3340,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Родителска сметка за данъци"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3506,8 +3382,7 @@ msgid "Central Journal"
 msgstr "Централен дневник"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Баланс пренесен напред"
 
@@ -3531,10 +3406,9 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "С баланс различен от 0"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -3583,8 +3457,7 @@ msgid "Journal code"
 msgstr "Код на дневник"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Създаване на записи"
 
@@ -3640,14 +3513,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Последователност"
@@ -3713,8 +3583,7 @@ msgstr "Абонамент за сметка"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Дата на падеж"
 
@@ -3734,8 +3603,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3773,8 +3641,7 @@ msgid "Unreconciled"
 msgstr "Неприравнен"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Бележка"
 
@@ -3798,8 +3665,7 @@ msgid "Entry Sequence"
 msgstr "Запис за последователност"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Приключен"
 
@@ -3922,12 +3788,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Активен"
@@ -3979,20 +3842,15 @@ msgid "Secondary Currency"
 msgstr "Втора валута"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4025,8 +3883,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Редове на отчет"
 
@@ -4118,18 +3975,15 @@ msgid "Journal Column"
 msgstr "Колона на дневник"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Готово"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4142,8 +3996,7 @@ msgid "Periods"
 msgstr "Периоди"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4170,8 +4023,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Данъци по подрабиране"
 
@@ -4228,8 +4080,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Име на сметка"
 
@@ -4320,8 +4171,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4347,14 +4197,12 @@ msgid "Posted"
 msgstr "Публикувано"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4375,8 +4223,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Редове"
 
@@ -4394,8 +4241,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Данъчна декларация"
 
@@ -4455,14 +4301,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Провинции"
 
@@ -4498,8 +4342,7 @@ msgstr "Начална дата"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Общо"
 
@@ -4616,11 +4459,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4717,12 +4558,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Отпечатай стара оборотна ведомост"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Отпратка"
 
@@ -4799,8 +4637,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Приходен"
@@ -4827,8 +4664,7 @@ msgstr "ДДС:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4839,8 +4675,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4856,8 +4691,7 @@ msgid "Account Reconciliation"
 msgstr "Приравняване на сметка"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Потвърждение"
 
@@ -4872,8 +4706,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4893,8 +4726,7 @@ msgid "Analytic account"
 msgstr "Аналтична сметка"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Фактура за доставчик"
 
@@ -4904,22 +4736,16 @@ msgid "Valid"
 msgstr "Проверен"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Дебит"
@@ -4981,8 +4807,7 @@ msgid "Reporting"
 msgstr "Справки"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5013,8 +4838,7 @@ msgid "Configuration"
 msgstr "Настройка"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Обща сума"
 
@@ -5064,14 +4888,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Дефиниция на данък"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Група данъци"
 
@@ -5106,14 +4928,12 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "С движения"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Домейн"
 
@@ -5138,9 +4958,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5157,8 +4975,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Ред от фактура"
 
@@ -5209,8 +5026,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5256,12 +5072,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Проект"
@@ -5288,8 +5101,7 @@ msgid "Are you sure ?"
 msgstr "Сигурни ли сте?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
@@ -5325,22 +5137,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Допълнителна информация"
 
@@ -5356,8 +5162,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5380,8 +5185,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Изчисление"
@@ -5425,8 +5229,7 @@ msgid "End of period"
 msgstr "Край на периода"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Запис от сметка"
 
@@ -5437,8 +5240,7 @@ msgid "General Journal"
 msgstr "Главен дневник"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5446,12 +5248,9 @@ msgstr "Главен дневник"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Баланс"
@@ -5497,11 +5296,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Последователността използвана за номера на фактури в този дневник."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Обща информация"
 
@@ -5540,8 +5336,7 @@ msgid "List of Accounts"
 msgstr "Списък със сметки"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5634,15 +5429,11 @@ msgstr "Интраком"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Описание"
 
@@ -5686,8 +5477,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Код на казус"
 
@@ -5769,8 +5559,7 @@ msgstr "Определения на модели"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "В брой"
 
@@ -5810,8 +5599,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
@@ -5858,10 +5646,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5895,10 +5681,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5957,8 +5741,7 @@ msgstr "Да"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Отбележете тук, ако на потребителя е разрешено да съгласува записи в тази "
 "сметка."
@@ -5967,3 +5750,331 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Изчисляване на въведените дати"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Покажи информация относно Дебит/Кредит"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Всички сметки"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Известяване"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Финансов период"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Баланс по сметка"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Избери период(и)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Процент"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Сравни избраните години по критерий"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Избери фискална година(и) (максимум три години"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Изберете сметка за отпратка(за % сравняване)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Баланс на сметка - сравняване на години"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Показване на справка в хоризонтална форма"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Покажи сравнението в %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Изберете период"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Настройки на справка"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Да не се сравняват"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Покажи сметки"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Избрахте повече от 3 години във всеки случай."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Година :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Може да изберете максимум 3 години. Моля проверете отново."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Дата на създаване"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Трябва да изберете поне една финансова година. Опитайте отново."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Настройка на справка"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 4fbfb05d262..c04e9b901ad 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Neporavnata knjiženja"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Osnovni kod"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Ostatak"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Odabir retka prijenosa"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Oznaka unosa"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Suma perioda"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Kod za izračunavanje (ako je tip=Python kod)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Redak računa"
 
@@ -232,12 +226,9 @@ msgstr "Ponavljajuće stavke"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Iznos"
@@ -278,8 +269,7 @@ msgstr ""
 "vlastiti pogled za brži unos u svakoj temeljnici."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -288,14 +278,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fiksno"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Dospijela plaćanja"
 
@@ -311,8 +299,7 @@ msgid "Select period"
 msgstr "Odaberite razdoblje"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Izvor"
 
@@ -342,8 +329,7 @@ msgid "Delta Debit"
 msgstr "Delta duguje"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Porez"
@@ -362,14 +348,12 @@ msgid "Analytic Account"
 msgstr "Analitičko konto"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Naziv naloga za knjiženje"
@@ -437,11 +421,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Stanje"
@@ -453,8 +434,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Neplaćeni povrati dobavljaču"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Posebno računanje"
 
@@ -476,10 +456,8 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Referenca"
@@ -672,8 +650,7 @@ msgid "Sub-Total :"
 msgstr "Sub-Total :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -705,8 +682,7 @@ msgid "Select the Period for Analysis"
 msgstr "Izaberi period za analizu"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -738,8 +714,7 @@ msgid "Field Name"
 msgstr "Naziv polja"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Predznak za roditelja"
 
@@ -749,8 +724,7 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjiženja završetka godine"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Karakteristike nabave"
 
@@ -770,12 +744,9 @@ msgid "Move Lines Created."
 msgstr "Stvoreni retci prijenosa."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Stanje"
 
@@ -928,10 +899,8 @@ msgstr "Odaberite kontni plan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Količina"
@@ -974,16 +943,13 @@ msgstr "Analitička faktura"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1005,8 +971,7 @@ msgid "Net Total:"
 msgstr "Ukupno netto:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1130,8 +1095,7 @@ msgid "Fiscal Position Templates"
 msgstr "Predlošci fiskalne pozicije"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Jedinična cijena"
 
@@ -1284,8 +1248,7 @@ msgid "Not reconciled transactions"
 msgstr "Neusklađene transakcije"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapiranje poreza"
@@ -1307,8 +1270,7 @@ msgid "Write-Off account"
 msgstr "Konto za otpis"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1334,11 +1296,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Odaberite fakture koje želite platiti i omogućuje avanse"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Prikaz"
 
@@ -1409,8 +1369,7 @@ msgstr "Tipovi konta"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1426,8 +1385,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Podkonta"
 
@@ -1453,8 +1411,7 @@ msgid "Statement reconcile line"
 msgstr "Redak usklađivanja izvoda"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Ne popunjavati za upotrebu računa za prihod"
 
@@ -1581,8 +1538,7 @@ msgid "Account n°"
 msgstr "Broj računa"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Ostavite prazno za korištenje rashodovnog računa"
 
@@ -1592,8 +1548,7 @@ msgid "Account to reconcile"
 msgstr "Račun za usklađivanje"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Vezna oznaka partnera"
@@ -1605,14 +1560,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Konta potraživanja i dugovanja"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Retci pretplate"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1776,8 +1729,7 @@ msgid "Period length (days)"
 msgstr "Duljina razdoblja (dana)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procenat"
@@ -1788,8 +1740,7 @@ msgid "Charts"
 msgstr "Planovi"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1863,12 +1814,9 @@ msgstr "x Nalog za knjiženje knjižnih odobrenja troškova"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tip"
 
@@ -2016,8 +1964,7 @@ msgid "Journal-Period Name"
 msgstr "Knjiženja - naziv perioda"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Naziv poreznog pretinca"
 
@@ -2032,8 +1979,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2107,10 +2053,8 @@ msgstr "Prošlost"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuta"
@@ -2148,8 +2092,7 @@ msgid "Analytic Entry"
 msgstr "Stavka analitike"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2201,8 +2144,7 @@ msgid "Detail"
 msgstr "Detalji"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidacija"
 
@@ -2297,21 +2239,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
@@ -2328,8 +2265,7 @@ msgid "Unreconcile"
 msgstr "Poništi usklađivanje"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tip poreza"
 
@@ -2339,8 +2275,7 @@ msgid "Statement Entries"
 msgstr "Stavke izvoda"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
@@ -2426,8 +2361,7 @@ msgid "Date End"
 msgstr "Završni datum"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2435,8 +2369,7 @@ msgid "Entry Lines"
 msgstr "Stavke unosa"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Podobna šifra (if type=šifra)"
 
@@ -2461,8 +2394,7 @@ msgstr "Unos stavke po retku"
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
-"Spisak svih poreza koji trebaju biti instalirani od strane čarobnjaka"
+msgstr "Spisak svih poreza koji trebaju biti instalirani od strane čarobnjaka"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2526,11 +2458,9 @@ msgstr "Iz analitičkog konta, stvori fakturu."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2549,8 +2479,7 @@ msgstr "Iz analitičkog konta, stvori fakturu."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -2560,10 +2489,8 @@ msgid "Acc. Type Name"
 msgstr "Naziv tipa konta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2577,8 +2504,7 @@ msgid "Litigation"
 msgstr "Parnica"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Obavijest"
@@ -2688,8 +2614,7 @@ msgid "Price"
 msgstr "Cijena"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2756,17 +2681,13 @@ msgid "Invoice Reference"
 msgstr "Referenca Fakture"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -2806,8 +2727,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2900,16 +2820,11 @@ msgid "Full Account Name"
 msgstr "Puno ime konta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2930,9 +2845,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Računovodstvo"
 
@@ -2977,10 +2890,8 @@ msgid "Centralisation"
 msgstr "Centralizacija"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Šifra poreza"
@@ -3022,14 +2933,12 @@ msgstr ""
 "datuma stvaranja ili datuma stvaranja plus uvjeti plaćanja partnera."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Stanje"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3067,8 +2976,7 @@ msgid "Cancel selected invoices"
 msgstr "Poništi odabrane Fakture"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3091,28 +2999,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Postavi u pripremu"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referenca dokumenta koji je stvorio ovu fakturu."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Duguje"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Osnovica"
 
@@ -3122,8 +3025,7 @@ msgid "Model Name"
 msgstr "Naziv modela"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Ostali"
 
@@ -3133,15 +3035,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Potvrdi"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3156,17 +3056,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3187,12 +3084,9 @@ msgid "By Date and Period"
 msgstr "Po datumu i razdoblju"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Bilješke"
@@ -3205,8 +3099,7 @@ msgid ""
 msgstr "Prijenosi računa fakture su usklađeni sa prijenosom računa plaćanja."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3231,21 +3124,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Unos izvoda stvara stavke za plaćanje"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Šifra"
 
@@ -3255,8 +3142,7 @@ msgid "Financial Management"
 msgstr "Upravljanje finansijama"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nijedan"
@@ -3283,8 +3169,7 @@ msgid "Additionnal Information"
 msgstr "Dodatne informacije"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Naziv poreza"
@@ -3361,8 +3246,7 @@ msgid "Partner Balance"
 msgstr "Saldo partnera"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Analitika treće strane"
 
@@ -3375,8 +3259,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3415,8 +3298,7 @@ msgid "Import invoice"
 msgstr "Uvoz fakture"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Kreiraj"
@@ -3432,8 +3314,7 @@ msgid "Invoice line"
 msgstr "Redak fakture"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Prečica"
 
@@ -3461,15 +3342,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Porezni račun roditelja"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3505,8 +3384,7 @@ msgid "Central Journal"
 msgstr "Glavni nalog za knjiženje"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Donešeni saldo"
 
@@ -3582,8 +3460,7 @@ msgid "Journal code"
 msgstr "Šifra naloga za knjiženje"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Stvori stavke"
 
@@ -3639,14 +3516,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Redoslijed"
@@ -3714,8 +3588,7 @@ msgstr "Konto pretplate"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Datum dospijeća"
 
@@ -3735,8 +3608,7 @@ msgid "Account Configure Wizard "
 msgstr "Čarobnjak za konfiguraciju računa "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Početni datum"
@@ -3774,8 +3646,7 @@ msgid "Unreconciled"
 msgstr "Neusklađen"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Bilješka"
 
@@ -3799,8 +3670,7 @@ msgid "Entry Sequence"
 msgstr "Redoslijed unosa"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Zatvoreno"
 
@@ -3925,12 +3795,9 @@ msgid "Code/Date"
 msgstr "Šifra/Datum"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktivan"
@@ -3982,20 +3849,15 @@ msgid "Secondary Currency"
 msgstr "Sekundarna valuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4028,8 +3890,7 @@ msgid "Account Move"
 msgstr "Konto prijenosa"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Retci izvoda"
 
@@ -4125,18 +3986,15 @@ msgid "Journal Column"
 msgstr "Kolona naloga za knjiženje"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Završeno"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4149,8 +4007,7 @@ msgid "Periods"
 msgstr "Razdoblja"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4177,8 +4034,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Analitički troškovi za refakturiranje nabave, timesheet-ovi,..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Zadani porezi"
 
@@ -4234,8 +4090,7 @@ msgstr "Tip kontrola"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Naziv konta"
 
@@ -4326,8 +4181,7 @@ msgid "Import file from your bank statement"
 msgstr "Uvezi datoteku iz bankovnog izvoda"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Interni tip"
 
@@ -4353,14 +4207,12 @@ msgid "Posted"
 msgstr "Proknjiženo"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Knjižna odobrenja"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Završni datum"
 
@@ -4381,8 +4233,7 @@ msgid "Day of the Month"
 msgstr "Dan u mjesecu"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Retci"
 
@@ -4400,8 +4251,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Porezni iskaz"
 
@@ -4461,14 +4311,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Stanja"
 
@@ -4504,8 +4352,7 @@ msgstr "Početni datum"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Ukupno"
 
@@ -4624,11 +4471,9 @@ msgstr "Potvrđene stavke iz fakture"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4725,12 +4570,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Ispis zrelog probnog salda"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Referenca"
 
@@ -4807,8 +4649,7 @@ msgid "Control Invoice"
 msgstr "Kontroliraj fakturu"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Potraživanja"
@@ -4835,8 +4676,7 @@ msgstr "PDV:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Ukupno:"
@@ -4847,8 +4687,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journa"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapiranje konta"
@@ -4864,8 +4703,7 @@ msgid "Account Reconciliation"
 msgstr "Usklađivanje konta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Potvrdi"
 
@@ -4880,8 +4718,7 @@ msgid "Parent Account Template"
 msgstr "Predložak roditeljskog računa"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4901,8 +4738,7 @@ msgid "Analytic account"
 msgstr "Analitički konto"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Ulazna faktura"
 
@@ -4912,22 +4748,16 @@ msgid "Valid"
 msgstr "Potvrđeno"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Duguje"
@@ -4989,8 +4819,7 @@ msgid "Reporting"
 msgstr "Izvještavanje"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5021,8 +4850,7 @@ msgid "Configuration"
 msgstr "Postavke"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Ukupni iznos"
 
@@ -5072,14 +4900,12 @@ msgid "Paid invoice"
 msgstr "Plaćena faktura"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definicija poreza"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupa poreza"
 
@@ -5122,8 +4948,7 @@ msgid "With movements"
 msgstr "Sa kretanjima"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domena"
 
@@ -5148,9 +4973,7 @@ msgid "Manually"
 msgstr "Ručno"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5167,8 +4990,7 @@ msgid "Payable Accounts"
 msgstr "Dugovni računi"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Redak fakture"
 
@@ -5219,8 +5041,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Plaćanja"
@@ -5266,12 +5087,9 @@ msgstr "Odaberite datum nalofa za knjiženje i plaćanja"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "U pripremi"
@@ -5298,8 +5116,7 @@ msgid "Are you sure ?"
 msgstr "Jeste li sigurni?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
@@ -5335,22 +5152,16 @@ msgid "Supplier Invoice Process"
 msgstr "Proces fakturiranja dobavljača"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Stranica"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Dodatne informacije"
 
@@ -5366,8 +5177,7 @@ msgid "Receivable and Payable"
 msgstr "Potraživanja i dugovanja"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5390,8 +5200,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Izračunaj"
@@ -5435,8 +5244,7 @@ msgid "End of period"
 msgstr "Kraj razdoblja"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Stavka konta"
 
@@ -5447,8 +5255,7 @@ msgid "General Journal"
 msgstr "Opći nalog za knjiženje"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5456,12 +5263,9 @@ msgstr "Opći nalog za knjiženje"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5505,11 +5309,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Opće informacije"
 
@@ -5551,8 +5352,7 @@ msgid "List of Accounts"
 msgstr "Lista konta"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Svojstva prodaje"
 
@@ -5645,15 +5445,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Opis"
 
@@ -5697,8 +5493,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Šifra pretinca"
 
@@ -5780,8 +5575,7 @@ msgstr "Definicija modela"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Gotovina"
 
@@ -5821,8 +5615,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Povrat dobavljaču"
 
@@ -5869,10 +5662,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5906,10 +5697,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Naziv fiskalne godine kako je prikazano na zaslonima"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5966,11 +5755,345 @@ msgstr "Da"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr "Provjeri da li je korisniku dozvoljeno poravnavanje unosa na kontu."
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Izračunaj datume stavaka"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Prikaži duguje/potražuje podatke"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Svi konta"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Odabir stavaka zasnovan na"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Obavještenje"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Financijsko razdoblje"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo konta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Odaberite razdoblja"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Procenat"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Usporedi odabrane godine pod uvjetima"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Izaberi odgovarajuća konta (za poređenje u %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Saldo konta - poredi godine"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Prikaži izvješće u položenoj formi"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Prikaži usporedbu u %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Odaberite razdoblje"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Postavke izvješća"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Ne uspoređuj"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Prikaži račune"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Godina:"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali "
+"\"Položeni\" format."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Ostavite prazno za usporedbu sa roditeljem"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Prilagodite izvješće"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index cc5d6d85b9a..fa2a47a1c43 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-04 09:39+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -94,8 +94,7 @@ msgid "Unreconciled entries"
 msgstr "Assentaments no conciliats"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Codi base"
@@ -127,8 +126,7 @@ msgid "Residual"
 msgstr "Pendent"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -192,10 +190,8 @@ msgid "Move line select"
 msgstr "Seleccioneu línia moviment"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Ref. assentament"
 
@@ -210,14 +206,12 @@ msgid "Period Sum"
 msgstr "Suma del període"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Codi per calcular (si tipus=codi)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Línia de l'assentament comptable"
 
@@ -234,12 +228,9 @@ msgstr "Assentaments recurrents"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Import"
@@ -280,8 +271,7 @@ msgstr ""
 "vista per codificar més ràpid en cada diari."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -295,14 +285,12 @@ msgstr ""
 "venciment, per exemple, 50% ara, 50% en un mes."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fix"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Pagaments fora de termini"
 
@@ -318,8 +306,7 @@ msgid "Select period"
 msgstr "Seleccioneu període"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origen"
 
@@ -349,8 +336,7 @@ msgid "Delta Debit"
 msgstr "Diferència deure"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Impost"
@@ -369,14 +355,12 @@ msgid "Analytic Account"
 msgstr "Compte analític"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Impost en fills"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nom diari"
@@ -444,11 +428,8 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estat"
@@ -460,8 +441,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Càlcul especial"
 
@@ -485,10 +465,8 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref."
@@ -685,8 +663,7 @@ msgid "Sub-Total :"
 msgstr "Subtotal :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -718,8 +695,7 @@ msgid "Select the Period for Analysis"
 msgstr "Seleccioneu el període d'anàlisi"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -751,8 +727,7 @@ msgid "Field Name"
 msgstr "Nom camp"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Signe pel pare"
 
@@ -762,8 +737,7 @@ msgid "End of Year Entries Journal"
 msgstr "Diari assentaments tancament d'exercici"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propietats de compra"
 
@@ -783,12 +757,9 @@ msgid "Move Lines Created."
 msgstr "Moviments creats."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Estat"
 
@@ -945,10 +916,8 @@ msgstr "Seleccioneu un pla comptable"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantitat"
@@ -991,16 +960,13 @@ msgstr "Factura analítica"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1022,8 +988,7 @@ msgid "Net Total:"
 msgstr "Total net:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1147,8 +1112,7 @@ msgid "Fiscal Position Templates"
 msgstr "Plantilles de posicions fiscals"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preu un."
 
@@ -1306,8 +1270,7 @@ msgid "Not reconciled transactions"
 msgstr "Transaccions no conciliades"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapa impostos"
@@ -1329,8 +1292,7 @@ msgid "Write-Off account"
 msgstr "Compte de desajust"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1356,11 +1318,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Vista"
 
@@ -1432,8 +1392,7 @@ msgstr "Tipus de comptes"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1449,8 +1408,7 @@ msgid "Journal"
 msgstr "Diari"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Comptes fills"
 
@@ -1476,8 +1434,7 @@ msgid "Statement reconcile line"
 msgstr "Línia de conciliació extracte"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Deixar buit pel compte d'ingressos"
 
@@ -1606,8 +1563,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Deixar buit pel compte de despeses"
 
@@ -1617,8 +1573,7 @@ msgid "Account to reconcile"
 msgstr "Compte per conciliar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Ref. empresa"
@@ -1630,14 +1585,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Comptes a cobrar i pagar"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Línies d'assentaments periòdics"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1732,8 +1685,7 @@ msgstr "Força període"
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
-"Indica l'ordre de seqüència al mostrar una llista de tipus de compte."
+msgstr "Indica l'ordre de seqüència al mostrar una llista de tipus de compte."
 
 #. module: account
 #: view:account.invoice:0
@@ -1802,8 +1754,7 @@ msgid "Period length (days)"
 msgstr "Longitud del període (dies)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentatge"
@@ -1814,8 +1765,7 @@ msgid "Charts"
 msgstr "Resums"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1891,12 +1841,9 @@ msgstr "x Diari factures rectificatives (abonament) de despeses"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipus"
 
@@ -2044,8 +1991,7 @@ msgid "Journal-Period Name"
 msgstr "Nom diari-període"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nom codi d'impost"
 
@@ -2063,8 +2009,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2138,10 +2083,8 @@ msgstr "Anterior"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Divisa"
@@ -2179,8 +2122,7 @@ msgid "Analytic Entry"
 msgstr "Assentament analític"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Missatge de pagaments fora de termini"
 
@@ -2232,8 +2174,7 @@ msgid "Detail"
 msgstr "Detall"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidació"
 
@@ -2330,21 +2271,16 @@ msgid "The account basis of the tax declaration."
 msgstr "El compte base de la declaració d'impostos."
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2361,8 +2297,7 @@ msgid "Unreconcile"
 msgstr "Trenca conciliació"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tipus impost"
 
@@ -2372,8 +2307,7 @@ msgid "Statement Entries"
 msgstr "Assentaments d'extractes"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Usuari"
 
@@ -2463,8 +2397,7 @@ msgid "Date End"
 msgstr "Data final"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2472,8 +2405,7 @@ msgid "Entry Lines"
 msgstr "Apunts"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Codi aplicable (si tipus=codi)"
 
@@ -2562,11 +2494,9 @@ msgstr "Des de comptes analítics, crea factura."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2585,8 +2515,7 @@ msgstr "Des de comptes analítics, crea factura."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -2596,10 +2525,8 @@ msgid "Acc. Type Name"
 msgstr "Nom tipus compte"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2613,8 +2540,7 @@ msgid "Litigation"
 msgstr "Litigi"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informació"
@@ -2731,8 +2657,7 @@ msgid "Price"
 msgstr "Preu"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2799,17 +2724,13 @@ msgid "Invoice Reference"
 msgstr "Referència factura"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nom"
@@ -2852,8 +2773,7 @@ msgstr ""
 "impostos fills. En aquest cas, l'ordre d'avaluació és important."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2946,16 +2866,11 @@ msgid "Full Account Name"
 msgstr "Nom del compte complet"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2976,9 +2891,7 @@ msgid "Document: Customer account statement"
 msgstr "Document: Estat comptable del client"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Comptabilitat"
 
@@ -3023,10 +2936,8 @@ msgid "Centralisation"
 msgstr "Centralització"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Codi impost"
@@ -3069,14 +2980,12 @@ msgstr ""
 "assentaments més els terminis de pagament de l'empresa."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situació"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Document"
 
@@ -3116,8 +3025,7 @@ msgid "Cancel selected invoices"
 msgstr "Cancel·la factures seleccionades"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3140,28 +3048,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Canvia a esborrany"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referència del document que ha creat aquesta factura."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "A pagar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base"
 
@@ -3171,8 +3074,7 @@ msgid "Model Name"
 msgstr "Nom model"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Altres"
 
@@ -3182,15 +3084,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Llegenda"
 
@@ -3205,17 +3105,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3236,12 +3133,9 @@ msgid "By Date and Period"
 msgstr "Per data i període"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notes"
@@ -3256,8 +3150,7 @@ msgstr ""
 "pagament(s)."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3282,21 +3175,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Codificació d'extractes crea assentaments de pagament"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Codi"
 
@@ -3306,8 +3193,7 @@ msgid "Financial Management"
 msgstr "Comptabilitat i finances"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Cap"
@@ -3334,8 +3220,7 @@ msgid "Additionnal Information"
 msgstr "Informació addicional"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nom impost"
@@ -3412,8 +3297,7 @@ msgid "Partner Balance"
 msgstr "Balanç d'empresa"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Llibre major de tercers"
 
@@ -3428,8 +3312,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3468,8 +3351,7 @@ msgid "Import invoice"
 msgstr "Importa factura"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Crea"
@@ -3485,8 +3367,7 @@ msgid "Invoice line"
 msgstr "Línia de factura"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Abreviació"
 
@@ -3515,15 +3396,13 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Compte impostos pare"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3559,8 +3438,7 @@ msgid "Central Journal"
 msgstr "Diari central"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo a compte nou"
 
@@ -3636,8 +3514,7 @@ msgid "Journal code"
 msgstr "Codi de diari"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Crea els assentaments"
 
@@ -3697,14 +3574,11 @@ msgstr ""
 "d'impost aparegui en les factures."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Seqüència"
@@ -3772,8 +3646,7 @@ msgstr "Subscripció de comptabilitat"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data venciment"
 
@@ -3793,8 +3666,7 @@ msgid "Account Configure Wizard "
 msgstr "Assistent de configuració comptabilitat "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data inicial"
@@ -3832,8 +3704,7 @@ msgid "Unreconciled"
 msgstr "No conciliat"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Nota"
 
@@ -3866,8 +3737,7 @@ msgid "Entry Sequence"
 msgstr "Seqüència de l'assentament"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Tancament"
 
@@ -3879,8 +3749,7 @@ msgstr "Assentaments de pagament"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
-"El compte pot ser un codi d'impostos base o un compte codi d'impostos."
+msgstr "El compte pot ser un codi d'impostos base o un compte codi d'impostos."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3996,12 +3865,9 @@ msgid "Code/Date"
 msgstr "Codi/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Actiu"
@@ -4053,20 +3919,15 @@ msgid "Secondary Currency"
 msgstr "Divisa secundària"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4099,8 +3960,7 @@ msgid "Account Move"
 msgstr "Assentament"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Línies extracte"
 
@@ -4197,18 +4057,15 @@ msgid "Journal Column"
 msgstr "Columna diari"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Realitzat"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4221,8 +4078,7 @@ msgid "Periods"
 msgstr "Períodes"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4249,8 +4105,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Costos analítics per a refacturar compres, fulls de serveis, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Impostos per defecte"
 
@@ -4309,8 +4164,7 @@ msgstr "Controls de tipus"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nom de compte"
 
@@ -4401,8 +4255,7 @@ msgid "Import file from your bank statement"
 msgstr "Importa fitxer des de extracte bancari"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tipus intern"
 
@@ -4428,14 +4281,12 @@ msgid "Posted"
 msgstr "Fixat"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Factures rectificatives (abonament)"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data final"
 
@@ -4456,8 +4307,7 @@ msgid "Day of the Month"
 msgstr "Dia del mes"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Línies"
 
@@ -4478,8 +4328,7 @@ msgstr ""
 "fills. En aquest cas, l'ordre d'avaluació és important."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaració d'impostos"
 
@@ -4539,14 +4388,12 @@ msgid "The optional quantity on entries"
 msgstr "La quantitat opcional en els assentaments"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Estats"
 
@@ -4582,8 +4429,7 @@ msgstr "Data inicial"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4702,11 +4548,9 @@ msgstr "Assentaments vàlids des de factura"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4803,12 +4647,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimeix balanç de comprovació anterior"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4888,8 +4729,7 @@ msgid "Control Invoice"
 msgstr "Controla factura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "A cobrar"
@@ -4916,8 +4756,7 @@ msgstr "IVA:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4928,8 +4767,7 @@ msgid "account.analytic.journal"
 msgstr "comptabilitat.analític.diari"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapa comptes"
@@ -4945,8 +4783,7 @@ msgid "Account Reconciliation"
 msgstr "Compte conciliació"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmat"
 
@@ -4961,8 +4798,7 @@ msgid "Parent Account Template"
 msgstr "Plantilla compte pare"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4983,8 +4819,7 @@ msgid "Analytic account"
 msgstr "Compte analític"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveïdor"
 
@@ -4994,22 +4829,16 @@ msgid "Valid"
 msgstr "Vàlid"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Deure"
@@ -5071,8 +4900,7 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5103,8 +4931,7 @@ msgid "Configuration"
 msgstr "Configuració"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Import total"
 
@@ -5156,14 +4983,12 @@ msgid "Paid invoice"
 msgstr "Factura pagada"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definició d'impostos"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grup de l'impost"
 
@@ -5206,8 +5031,7 @@ msgid "With movements"
 msgstr "Amb moviments"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domini"
 
@@ -5232,9 +5056,7 @@ msgid "Manually"
 msgstr "Manualment"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5251,8 +5073,7 @@ msgid "Payable Accounts"
 msgstr "Comptes a pagar"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Línia factura"
 
@@ -5303,8 +5124,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "L'altra divisa opcional si és un assentament multi-divisa."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Pagaments"
@@ -5350,12 +5170,9 @@ msgstr "Seleccioneu diari i data de pagament"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Esborrany"
@@ -5382,8 +5199,7 @@ msgid "Are you sure ?"
 msgstr "Esteu segur?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5419,22 +5235,16 @@ msgid "Supplier Invoice Process"
 msgstr "Procés factura de proveïdor"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Pàgina"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informació opcional"
 
@@ -5450,8 +5260,7 @@ msgid "Receivable and Payable"
 msgstr "A cobrar i pagar"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5477,8 +5286,7 @@ msgstr ""
 "aquest camp contindrà l'import base (sense impostos)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calcula"
@@ -5523,8 +5331,7 @@ msgid "End of period"
 msgstr "Fi del període"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Assentament comptable"
 
@@ -5535,8 +5342,7 @@ msgid "General Journal"
 msgstr "Diari general"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5544,12 +5350,9 @@ msgstr "Diari general"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo pendent"
@@ -5595,11 +5398,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "La seqüència utilitzada pels números de factura en aquest diari."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informació general"
 
@@ -5641,8 +5441,7 @@ msgid "List of Accounts"
 msgstr "Llistat de comptes"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Propietats de venda"
 
@@ -5735,15 +5534,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descripció"
 
@@ -5791,8 +5586,7 @@ msgstr ""
 "pagar per l'empresa actual."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Codi"
 
@@ -5874,8 +5668,7 @@ msgstr "Definició de models d'assentaments"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Caixa"
 
@@ -5915,8 +5708,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Factura rectificativa (abonament) de proveïdor"
 
@@ -5965,10 +5757,8 @@ msgstr ""
 "producte actual."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -6002,10 +5792,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nom de l'exercici fiscal que es mostra en pantalla."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6064,8 +5852,7 @@ msgstr "Sí"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Marqueu aquesta opció si l'usuari se li permet conciliar assentaments en "
 "aquest compte."
@@ -6075,5 +5862,358 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Calcula les dates de l'assentament"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Comptes analítics a tancar"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Factures esborrany"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Taulell de comptabilitat"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Comptes a facturar"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "A cobrar anteriors"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Taulell per comptables"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Comptes d'ingressos"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Els meus indicadors"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Taulell de comptabilitat"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Ingressos anteriors"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostra informació dèbit/crèdit"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Tots els comptes"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selecció d'entrades basada en"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificació"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Període financer"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo comptable"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Selecciona període(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Compara exercicis seleccionats en termes de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Selecciona exercici(s) fiscal(s) (màxim 3 anys)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selecciona compte de referència (per comparació %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Saldo comptable-Compara exercicis"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"El mòdul de balanç de comptes és una funcionalitat afegida al mòdul de "
+"gestió financera.\n"
+"\n"
+"    Aquest mòdul ofereix diverses opcions d'impressió de balanços.\n"
+"\n"
+"    1. Es pot comparar el balanç de diferents anys.\n"
+"\n"
+"    2. Podeu establir la comparació en import o percentual entre dos anys.\n"
+"\n"
+"    3. Podeu configurar el compte de referència per a la comparació "
+"percentual per a anys en particular.\n"
+"\n"
+"    4. Podeu seleccionar períodes com una data real o períodes com a data de "
+"creació.\n"
+"\n"
+"    5. Podeu imprimir l'informe escollit en format apaïsat.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Heu de seleccionar l'opció 'Horitzontal'. Marqueu-la."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostra informe en format horitzontal"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostra comparació en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selecciona període"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opcions de l'informe"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "No compara"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostra comptes"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Ha de seleccionar més de 3 exercicis en qualsevol cas."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Gestió comptable financera - Comparació de comptes"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Pot seleccionar un màxim de 3 exercicis. Seleccioneu un altre vegada."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Heu seleccionat la opció 'Percentatge' amb més de 2 exercicis, però no ha "
+"seleccionat format horitzontal."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Podríeu haver comès els següents errors. Corregiu-los e intenteu de nou."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Deixeu-lo buit per a comparar amb els seus pares"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data creació"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. No heu seleccionat l'opció 'Percentatge', però heu seleccionat més de 2 "
+"exercicis."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Pot haver seleccionat les opcions comparar amb més de 1 exercici amb "
+"columnes crèdit/dèbit i opció %. Això pot ocasionar que hi hagin continguts "
+"que s'imprimeixin fora del paper. Intenteu de nou."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Heu de seleccionar al menys un exercici fiscal. Intenteu de nou."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Informe personalitzat"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Rang mensual"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Factures creades en els últims 15 dies"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Informe de factures creades en els últims 15 dies"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Import total"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Comptes per tipus"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "A cobrar anteriors fins avui"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Comptes a cobrar"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Rang"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Mòdul que afegeix nous informes basat en el mòdul comptable-financer."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Informe comptable - Informe"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo per tipus de compte"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Setmana de l'any"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Data creació"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "A cobrar anteriors"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imposable"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.assistent"
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 9c3ece7bb8d..978b1adc6fd 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Nesmířené částky"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Základní kód"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr "Zbytek"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr "Přesun řádku vyberte"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Vložení štítku"
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Částka"
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Pevné"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Zpožděné platby"
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr "Vyberte období"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Původ"
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Daň"
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr "Analytický účet"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Daň z dětí"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Název časopisu"
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr "Kontraindikace"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Země"
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Speciální výpočetní"
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr "Název pole"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Přihlaste se na mateřské"
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Nákup Nemovitosti"
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr "Přesun vytvořených linek."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Stav"
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Množství"
@@ -963,16 +932,13 @@ msgstr "analytické faktury"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr "Čistá celkem:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr "Fiskální pozice Šablony"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena za kus"
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr "Odpis účet"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Vzor"
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Pohled"
 
@@ -1394,8 +1354,7 @@ msgstr "Typy účtů"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr "Časopis"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Dětská konta"
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr "Délka období (dny)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1820,21 +1771,9 @@ msgid "year"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,checktype,report:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
-#: wizard_button:account.analytic.account.balance.report,init,report:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
-#: wizard_button:account.analytic.account.journal.report,init,report:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
-#: wizard_button:account.central.journal.report,init,print:0
-#: wizard_button:account.general.journal.report,init,print:0
-#: wizard_button:account.general.ledger.report,checktype,checkreport:0
-#: wizard_button:account.partner.balance.report,init,report:0
-#: wizard_button:account.print.journal.report,init,print:0
-#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "Tisk"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
@@ -1848,12 +1787,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2001,8 +1937,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1952,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2025,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2132,8 +2064,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2116,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2249,13 +2179,9 @@ msgid "Date Invoiced"
 msgstr ""
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Všechna období jsou prázdná"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2278,21 +2204,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2230,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2240,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2326,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2334,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2423,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2444,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2454,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2469,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2579,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2646,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2786,8 +2692,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2785,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2810,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2957,10 +2855,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2896,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2939,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2962,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +2988,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +2998,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3019,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3047,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3062,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3087,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3105,7 @@ msgid "Financial Management"
 msgstr "Finanční hospodaření"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3132,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3339,8 +3209,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3222,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3259,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3275,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,15 +3300,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3342,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3418,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3474,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3544,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3564,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3602,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3626,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3747,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3949,20 +3801,15 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3840,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3932,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3953,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3980,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4190,12 +4031,10 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "Název účtu"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4203,9 +4042,10 @@ msgid "Payment date"
 msgstr ""
 
 #. module: account
-#: wizard_button:account_use_models,create,end:0
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4284,8 +4124,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4311,14 +4150,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4339,8 +4176,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4194,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4254,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4462,8 +4295,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4580,11 +4412,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4509,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4761,8 +4588,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4789,8 +4615,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4626,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4818,8 +4642,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4834,8 +4657,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,8 +4675,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4864,22 +4685,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4941,8 +4756,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4787,7 @@ msgid "Configuration"
 msgstr "Konfigurace"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5024,14 +4837,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5066,14 +4877,12 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "S pohyby"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5098,9 +4907,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5117,8 +4924,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5169,8 +4975,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5216,12 +5021,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5248,8 +5050,7 @@ msgid "Are you sure ?"
 msgstr "Jste si jisti?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5086,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5316,8 +5111,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5134,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5385,8 +5178,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,8 +5189,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5406,12 +5197,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5455,11 +5243,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5498,8 +5283,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5592,15 +5376,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5644,8 +5424,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5726,11 +5505,9 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Hotovost"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5768,8 +5545,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5816,10 +5592,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5627,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5685,338 @@ msgstr "Ano"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Všechny účty"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Oznámení"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Zvolte Období"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Procento"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Zobrazit porovnání v %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Nastavení výpisu"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Zobrazit Účty"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 7985c9b882e..42cb491a632 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Offene Posten"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Steuerbemessung"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Restwert"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Auswahl Buchungszeile"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Buchungstext"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Summe Periode"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Berechne Quellcode (if type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Buchungszeile"
 
@@ -232,12 +226,9 @@ msgstr "Wiederkehrende Buchungen"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Betrag"
@@ -274,8 +265,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -287,14 +277,12 @@ msgstr ""
 "verschiedene Fälligkeitstage berechnen, zB 50% jetzt und 50% in einem Monat"
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fest"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Fällige Rechnungen"
 
@@ -310,8 +298,7 @@ msgid "Select period"
 msgstr "Periode auswählen"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Bezug"
 
@@ -341,8 +328,7 @@ msgid "Delta Debit"
 msgstr "Delta Soll"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Steuer"
@@ -361,14 +347,12 @@ msgid "Analytic Account"
 msgstr "Analytisches Konto"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Steuer auf untergeordnete Datensätze"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Journal Bezeichnung"
@@ -436,11 +420,8 @@ msgid "Contra"
 msgstr "Gegenposition"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Status"
@@ -452,8 +433,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Offene Gutschriften Lieferanten"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Spezielle Berechnung"
 
@@ -476,10 +456,8 @@ msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Referenz"
@@ -679,8 +657,7 @@ msgid "Sub-Total :"
 msgstr "Zwischensumme"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -712,8 +689,7 @@ msgid "Select the Period for Analysis"
 msgstr "Auswahl Periode"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -745,8 +721,7 @@ msgid "Field Name"
 msgstr "Bezeichnung Feld"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Vorzeichen (Ober-) Konto"
 
@@ -756,8 +731,7 @@ msgid "End of Year Entries Journal"
 msgstr "Jahresende Buchungsjournal"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Einkauf Eigenschaften"
 
@@ -777,12 +751,9 @@ msgid "Move Lines Created."
 msgstr "Erzeugte Buchungssätze"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Status"
 
@@ -939,10 +910,8 @@ msgstr "Wähle Finanzkontenplan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Menge"
@@ -985,16 +954,13 @@ msgstr "Rechnung (Analyse)"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1016,8 +982,7 @@ msgid "Net Total:"
 msgstr "Nettosumme:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1141,8 +1106,7 @@ msgid "Fiscal Position Templates"
 msgstr "Summen- & Saldenliste Vorlagen"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preis/UoM"
 
@@ -1300,8 +1264,7 @@ msgid "Not reconciled transactions"
 msgstr "Nicht ausgeglichene OPs"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Steuer Zuordnung"
@@ -1323,8 +1286,7 @@ msgid "Write-Off account"
 msgstr "Abschreibungskonto"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Standard"
 
@@ -1350,11 +1312,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Wähle zu zahlende Rechnungen und manage Vorauszahlungen"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Ansicht"
 
@@ -1425,8 +1385,7 @@ msgstr "Kontoart"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1442,8 +1401,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "untergeordnete Konten"
 
@@ -1469,8 +1427,7 @@ msgid "Statement reconcile line"
 msgstr "Ausgleich Offene Posten Buchung"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Leer lassen um das Erlöskonto zu nutzen"
 
@@ -1599,8 +1556,7 @@ msgid "Account n°"
 msgstr "Kontonummer"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Leer lassen um Aufwandskonto zu verwenden"
 
@@ -1610,8 +1566,7 @@ msgid "Account to reconcile"
 msgstr "Auszugleichendes Konto"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Partner Ref."
@@ -1623,14 +1578,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Forderungen- und Verbindlichkeitskonten"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Wiederkehrende Buchungen"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1794,8 +1747,7 @@ msgid "Period length (days)"
 msgstr "Periodenzeitraum"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Prozent"
@@ -1806,8 +1758,7 @@ msgid "Charts"
 msgstr "Finanzkonten"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1883,12 +1834,9 @@ msgstr "x Journal Lieferantengutschriften"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Typ"
 
@@ -2036,8 +1984,7 @@ msgid "Journal-Period Name"
 msgstr "Journal Periode Bezeichnung"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Umsatzsteuer Nachweis"
 
@@ -2055,8 +2002,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2131,10 +2077,8 @@ msgstr "Vergangenheit"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Währung"
@@ -2172,8 +2116,7 @@ msgid "Analytic Entry"
 msgstr "Buchung Analysekonto"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Text Zahlungserinnerung"
 
@@ -2225,8 +2168,7 @@ msgid "Detail"
 msgstr "Details"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidierung"
 
@@ -2320,21 +2262,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Das Basis Konto für die Steuererklärung"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
@@ -2351,8 +2288,7 @@ msgid "Unreconcile"
 msgstr "Storno Ausgleich"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Steuerart"
 
@@ -2362,8 +2298,7 @@ msgid "Statement Entries"
 msgstr "Beleg Erfassen"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
@@ -2453,8 +2388,7 @@ msgid "Date End"
 msgstr "gültig bis"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2462,8 +2396,7 @@ msgid "Entry Lines"
 msgstr "Erfasse Buchungen"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Anzuwendender Typ (if type=code)"
 
@@ -2552,11 +2485,9 @@ msgstr "Erzeuge Rechnung aus dem Analysekonto"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2575,8 +2506,7 @@ msgstr "Erzeuge Rechnung aus dem Analysekonto"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2586,10 +2516,8 @@ msgid "Acc. Type Name"
 msgstr "Kontoart Bezeichnung"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2603,8 +2531,7 @@ msgid "Litigation"
 msgstr "Rechtsstreit"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Information"
@@ -2720,8 +2647,7 @@ msgid "Price"
 msgstr "Preis"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2788,17 +2714,13 @@ msgid "Invoice Reference"
 msgstr "Rechnungsreferenz"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Bezeichnung"
@@ -2840,8 +2762,7 @@ msgstr ""
 "wichtig, wenn es untergeordnete Steuern gibt."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2934,16 +2855,11 @@ msgid "Full Account Name"
 msgstr "vollständiger Kontoname"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2964,9 +2880,7 @@ msgid "Document: Customer account statement"
 msgstr "Dokument: Kundenkontoauszug"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Finanzbuchhaltung"
 
@@ -3011,10 +2925,8 @@ msgid "Centralisation"
 msgstr "Zentralisierung"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Steuer"
@@ -3056,14 +2968,12 @@ msgstr ""
 "Start- / Endedatum sowie den Zahlungsbedingungen."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situation"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3101,8 +3011,7 @@ msgid "Cancel selected invoices"
 msgstr "Storniere ausgew. Rechnungen"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3125,28 +3034,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Setze auf Entwurf"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referenz des Rechnungsdokuments"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Verbindlichkeiten"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Steuermessbetrag"
 
@@ -3156,8 +3060,7 @@ msgid "Model Name"
 msgstr "Buchungsvorlage Bezeichnung"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Sachkonto"
 
@@ -3167,15 +3070,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validieren"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legende"
 
@@ -3192,17 +3093,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3223,12 +3121,9 @@ msgid "By Date and Period"
 msgstr "Nach Datum und Periode"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Bemerkungen"
@@ -3241,8 +3136,7 @@ msgid ""
 msgstr "Rechnungsausgleich erfolgte durch Buchungen der Zahlung(en)."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3267,21 +3161,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Bankauszug produziert Zahlungsvorschlagsbuchung"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kurzbezeichnung"
 
@@ -3291,8 +3179,7 @@ msgid "Financial Management"
 msgstr "Finanzen"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Keine"
@@ -3321,8 +3208,7 @@ msgid "Additionnal Information"
 msgstr "Zusatzinformation"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Steuer Bezeichnung"
@@ -3399,8 +3285,7 @@ msgid "Partner Balance"
 msgstr "Partner Saldenliste"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Buchungsdetails"
 
@@ -3415,8 +3300,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3456,8 +3340,7 @@ msgid "Import invoice"
 msgstr "Importiere Rechnung"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Erstellen"
@@ -3473,8 +3356,7 @@ msgid "Invoice line"
 msgstr "Rechnungsposition"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Tastenkombination (Shortcut)"
 
@@ -3504,15 +3386,13 @@ msgstr ""
 "handelt"
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "(Ober-) Steuerkonto"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3548,8 +3428,7 @@ msgid "Central Journal"
 msgstr "Zentrales Journal"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldenliste anzeigen"
 
@@ -3625,8 +3504,7 @@ msgid "Journal code"
 msgstr "Journal Kurz"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Erzeuge Buchungen"
 
@@ -3685,14 +3563,11 @@ msgstr ""
 "aufscheinen sollen"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sequenzer"
@@ -3760,8 +3635,7 @@ msgstr "Konto Automatische Buchung"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Fälligkeitstermin"
 
@@ -3781,8 +3655,7 @@ msgid "Account Configure Wizard "
 msgstr "Assistent Konto Stammdaten "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Start Datum"
@@ -3820,8 +3693,7 @@ msgid "Unreconciled"
 msgstr "Offene Posten"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Bemerkung"
 
@@ -3854,8 +3726,7 @@ msgid "Entry Sequence"
 msgstr "Sequenzer"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Beendet"
 
@@ -3984,12 +3855,9 @@ msgid "Code/Date"
 msgstr "Kurz/Datum"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiv"
@@ -4041,20 +3909,15 @@ msgid "Secondary Currency"
 msgstr "Alternative Währung"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4087,8 +3950,7 @@ msgid "Account Move"
 msgstr "Belegnummer"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Belegzeilen"
 
@@ -4185,18 +4047,15 @@ msgid "Journal Column"
 msgstr "Journal Spalte"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Erledigt"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4209,8 +4068,7 @@ msgid "Periods"
 msgstr "Perioden"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4239,8 +4097,7 @@ msgstr ""
 "Zeitaufzeichnungen, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Standard Steuern"
 
@@ -4300,8 +4157,7 @@ msgstr "Kontoarten Auswahl"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Konto Bezeichnung"
 
@@ -4392,8 +4248,7 @@ msgid "Import file from your bank statement"
 msgstr "Importiere Datei Ihres Bankkontoauszugs"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Intern"
 
@@ -4419,14 +4274,12 @@ msgid "Posted"
 msgstr "Gesendet"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Gutschrift"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "End Datum"
 
@@ -4447,8 +4300,7 @@ msgid "Day of the Month"
 msgstr "Tag (Monatsbasis)"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Positionen"
 
@@ -4470,8 +4322,7 @@ msgstr ""
 "Auswahl entscheidend."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Steuererklärung"
 
@@ -4533,14 +4384,12 @@ msgid "The optional quantity on entries"
 msgstr "optinale Mengenangaben in Buchungen"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Bundesland"
 
@@ -4576,8 +4425,7 @@ msgstr "gültig von"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Betrag gesammt"
 
@@ -4696,11 +4544,9 @@ msgstr "Validiere Buchung"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4797,12 +4643,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Druck Forderungen nach Alter"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4881,8 +4724,7 @@ msgid "Control Invoice"
 msgstr "Eingangsrechnung"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Forderungen"
@@ -4909,8 +4751,7 @@ msgstr "UID:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Summe:"
@@ -4921,8 +4762,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Konten Zuordnung"
@@ -4938,8 +4778,7 @@ msgid "Account Reconciliation"
 msgstr "Konto OP Ausgleich"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -4954,8 +4793,7 @@ msgid "Parent Account Template"
 msgstr "(Ober-) Finanzkonto Vorlage"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4975,8 +4813,7 @@ msgid "Analytic account"
 msgstr "Analytisches Konto"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Eingangsrechnungen"
 
@@ -4986,22 +4823,16 @@ msgid "Valid"
 msgstr "Gültig"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Soll"
@@ -5063,8 +4894,7 @@ msgid "Reporting"
 msgstr "Berichtswesen"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5095,8 +4925,7 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Gesamtwert"
 
@@ -5147,14 +4976,12 @@ msgid "Paid invoice"
 msgstr "Rechnung Bezahlt"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Steuer Definition"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Steuer Gruppe"
 
@@ -5197,8 +5024,7 @@ msgid "With movements"
 msgstr "mit Buchungen"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domain"
 
@@ -5223,9 +5049,7 @@ msgid "Manually"
 msgstr "Manuell"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5242,8 +5066,7 @@ msgid "Payable Accounts"
 msgstr "Verbindlichkeitskonten"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Rechungsposition"
 
@@ -5294,8 +5117,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Optionaler Fremdwährungsbetrag"
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Anzeige Zahlungen"
@@ -5341,12 +5163,9 @@ msgstr "Wähle Journal und Zahlungsdatum"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Entwurf"
@@ -5373,8 +5192,7 @@ msgid "Are you sure ?"
 msgstr "Sind Sie sicher?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5410,22 +5228,16 @@ msgid "Supplier Invoice Process"
 msgstr "Prozess Abrechnung Lieferanten"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Seite"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informationen (Optional)"
 
@@ -5441,8 +5253,7 @@ msgid "Receivable and Payable"
 msgstr "Forderungen und Verbindlichkeiten"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5468,8 +5279,7 @@ msgstr ""
 "beinhaltet das Feld den Steuermesswert auf den die Steuer berechnet wird."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Berechne"
@@ -5513,8 +5323,7 @@ msgid "End of period"
 msgstr "Ende Abrechnungszeitraum"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Buchungssatz"
 
@@ -5525,8 +5334,7 @@ msgid "General Journal"
 msgstr "Journal Sachkonten"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5534,12 +5342,9 @@ msgstr "Journal Sachkonten"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5585,11 +5390,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Die Sequenz die Nummerierung der Rechnungen dieses Journals"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Grundinformation"
 
@@ -5631,8 +5433,7 @@ msgid "List of Accounts"
 msgstr "Kontenliste"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Verkauf Eigenschaften"
 
@@ -5725,15 +5526,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -5781,8 +5578,7 @@ msgstr ""
 "Partner verwendet"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Steuercode Nummer"
 
@@ -5864,8 +5660,7 @@ msgstr "Definition Buchungsvorlagen"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Kasse/Bank"
 
@@ -5905,8 +5700,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Lasse leer für alle offenen Wirtschaftsjahre"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Lieferanten Gutschrift"
 
@@ -5955,10 +5749,8 @@ msgstr ""
 "Produktkategorie zu erfassen."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5992,10 +5784,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Bezeichnung Wirtschaftsjahr"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6053,8 +5843,7 @@ msgstr "Ja"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
 
 #. module: account
@@ -6062,5 +5851,356 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
 msgid "Compute Entry Dates"
 msgstr "Berechne eingegebene Daten"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Analytische Konten für Periodenabschluss"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Entwurf Rechnungen"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Finanzen Dashboard"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Abzurechnende Analytische Konten"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Abzurechnende Kosten"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Überfällige Forderungen"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Anzeigetafel für Rechnungswesen"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Ertragskonten"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Meine Indikatoren"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Finanzen Anzeigetafel"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Überfällige Erträge"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Zeige Soll/Haben Information"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Alle Konten"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Auswahl der Buchungen basiert auf"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Benachrichtigung"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Geschäftsjahres Periode"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Kontensaldo"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Periodenauswahl"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Prozentsatz"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Vergleiche ausgewählte Jahre in Bezig auf"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Auswahl der Geschäftsjahre (Max 3)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Auswahl des Referenzkontos ( für % Vergleich)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Konten Saldo - Jahresvergleich"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Account Balance erweitert die Funktionalität der Finanz Modules\n"
+"\n"
+"    Mit diesem Modul können verschiedene Darstellungen einer BIlanz gedruckt "
+"werden\n"
+"\n"
+"    1. Jahresvergleiche\n"
+"\n"
+"    2. Vergleichswerte in Geld oder Prozent.\n"
+"\n"
+"    3. Definition des Kontos der 100% Basis\n"
+"\n"
+"    4. Auswahl der Perioden aufgrund Buchungs oder Erstellungsdatum\n"
+"\n"
+"    5. Druck in Hoch oder Querformat\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Sie müssen \"Querformat\" auswählen."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Report im Querformat anzeigen"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Summe :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Zeige Vergleich in %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Periode auswählen"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Report Optionen"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "NIcht Vergleichen"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Zeige Konten"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Sie haben jedenfalls mehr als 3 Jahre ausgewählt."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Buchhaltung und Finanzmanagement - Vergleiche Konten"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Jahr"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Sie können maximal 3 Jahre auswählen.  Nochmals versuchen!"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Sie haben die 'Prozent' Option mit mehr als 2 Jahren ausgewählt, jedoch "
+"nicht \"Querformat\"."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Sie haben möglicherweise folgende Fehler gemacht. Bitte korrigieren und "
+"nochmals versuchen."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Für Vergleich mit übergeordnetem Satz leer lassen"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Erzeugt am"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr "2. Sie haben mehr als 2 Jahre ohne \"Prozent\" Option ausgewählt."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Sie haben die Vergleiche mit mehr als einem Jahr, sowie Soll/Haben Spalten "
+"und der % Option ausgewählt.\r\n"
+"Das könnte dazu führen, das über den Papierrand gedruckt wird. Ändern Sie "
+"bitte die Anforderung."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Sie müssen mindestens 1 Geschäftsjahr auswählen. Nochmals versuchen!"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Personalisierung Report"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Monate"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Rechnungen der letzten 15 Tage"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Rechnungen der letzten 15 Tage"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Gesamtbetrag"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Konten nach Typ"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Überfällige Rechnungen bis heute"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Forderungskonten"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Bereich"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Dieses Module erwietert das Finanz Module um weitere Reports"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Finanz Reporting"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo nach Kontotypen"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Woche eines Jahres"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Erzeugt am"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Überfällige Forderungen"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Nettobetrag"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 998c457661c..9ef36f7f275 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -94,8 +94,7 @@ msgid "Unreconciled entries"
 msgstr "Μη εκκαθαρισμένες καταχωρήσεις"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Βασικός Κωδικός Φορολόγισης"
@@ -127,8 +126,7 @@ msgid "Residual"
 msgstr "Υπόλοιπο"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -192,10 +190,8 @@ msgid "Move line select"
 msgstr "Μετακινήστε την γραμμή που επιλέξατε"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Ετικέτα εγγραφής"
 
@@ -210,14 +206,12 @@ msgid "Period Sum"
 msgstr "Σύνολο Περιόδου"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Υπολογισμός Κώδικα (αν τύπος=κώδικας)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Γραμμή Εγγραφών Λογαριασμού"
 
@@ -234,12 +228,9 @@ msgstr "Περιοδικές Εγγραφές"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Ποσό"
@@ -280,8 +271,7 @@ msgstr ""
 "δημιουργήσετε την δική σας όψη για ταχύτερη κωδικοποίηση σε κάθε ημερολόγιο."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -295,14 +285,12 @@ msgstr ""
 "50% τώρα και 50% σε έναν μήνα."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Σταθερό"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Ληξιπρόθεσμες Οφειλές"
 
@@ -318,8 +306,7 @@ msgid "Select period"
 msgstr "Επιλέξτε περίοδο"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Προέλευση"
 
@@ -349,8 +336,7 @@ msgid "Delta Debit"
 msgstr "Χρέωση Δέλτα"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Φόρος"
@@ -369,14 +355,12 @@ msgid "Analytic Account"
 msgstr "Λογαριασμός Αναλυτικής"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Φόροι σε Υποκατηγορίες"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Όνομα Ημερολογίου"
@@ -445,11 +429,8 @@ msgid "Contra"
 msgstr "Αρνητικός"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Κατάσταση"
@@ -461,8 +442,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Ανεξόφλητες Επιστροφές Προμηθευτών"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Ειδικός Υπολογισμός"
 
@@ -484,10 +464,8 @@ msgid "Disc.(%)"
 msgstr "Εκπτ.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Παραπομπή"
@@ -685,8 +663,7 @@ msgid "Sub-Total :"
 msgstr "Υποσύνολο:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -718,8 +695,7 @@ msgid "Select the Period for Analysis"
 msgstr "Διαλέξτε την περίοδο για ανάλυση"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -751,8 +727,7 @@ msgid "Field Name"
 msgstr "Όνομα Πεδίου"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Πρόσημο του μητρικού"
 
@@ -762,8 +737,7 @@ msgid "End of Year Entries Journal"
 msgstr "Εγγραφές Κλεισίματος Ημερολογίου"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Ιδιότητες Αγοράς"
 
@@ -783,12 +757,9 @@ msgid "Move Lines Created."
 msgstr "Μετακίνηση Δημιουργημένων Γραμμών"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -945,10 +916,8 @@ msgstr "Επιλογή Λογιστικού Σχεδίου"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Ποσότητα"
@@ -991,16 +960,13 @@ msgstr "Τιμολόγιο αναλυτικής"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1022,8 +988,7 @@ msgid "Net Total:"
 msgstr "Καθαρό Σύνολο:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1147,8 +1112,7 @@ msgid "Fiscal Position Templates"
 msgstr "Πρότυπα Φορολογικής Θέσης"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Τιμή Μονάδας"
 
@@ -1307,8 +1271,7 @@ msgid "Not reconciled transactions"
 msgstr "Μή συμφωνηθείσες συναλλαγές"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Χάρτης Φόρων"
@@ -1330,8 +1293,7 @@ msgid "Write-Off account"
 msgstr "Λογαριασμός παραγραφών"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Μοντέλο"
 
@@ -1358,11 +1320,9 @@ msgstr ""
 "Επιλέξτε τα τιμολόγια που θέλετε να πληρώσετε και διαχειριστείτε προκαταβολές"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Όψη"
 
@@ -1433,8 +1393,7 @@ msgstr "Τύποι Λογαριασμών"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1450,8 +1409,7 @@ msgid "Journal"
 msgstr "Ημερολόγιο"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Ελαχιστοβάθμιοι Λογαριασμοί"
 
@@ -1477,8 +1435,7 @@ msgid "Statement reconcile line"
 msgstr "Γραμμή συμφωνίας παραστατικού"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Διατηρήστε το κενό για να χρησιμοποιηθεί ο λογαριασμός εσόδων"
 
@@ -1607,8 +1564,7 @@ msgid "Account n°"
 msgstr "Αρ. Λογαριασμού"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Διατηρήστε κενό για να χρησιμοποιήσετε τον λογαριασμό εξόδων"
 
@@ -1618,8 +1574,7 @@ msgid "Account to reconcile"
 msgstr "Λογαριασμός προς συμφωνία"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Παρ. Συνεργάτη"
@@ -1631,14 +1586,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Εισπρακτέοι και Πληρωτέοι Λογαριασμοί"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Γραμμές προεγγραφής"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1804,8 +1757,7 @@ msgid "Period length (days)"
 msgstr "Μήκος Περιόδου"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Ποσοστό"
@@ -1816,8 +1768,7 @@ msgid "Charts"
 msgstr "Πίνακες"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1893,12 +1844,9 @@ msgstr "x Expenses Credit Notes Journal"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Τύπος"
 
@@ -2046,8 +1994,7 @@ msgid "Journal-Period Name"
 msgstr "Όνομα Ημερολογίου-Περιόδου"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Όνομα Θέματος Φόρου"
 
@@ -2064,8 +2011,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2140,10 +2086,8 @@ msgstr "Περασμένο"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Νόμισμα"
@@ -2181,8 +2125,7 @@ msgid "Analytic Entry"
 msgstr "Αναλυτική Εγγραφή"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Μήνυμα καθυστερημένων πληρωμών"
 
@@ -2234,8 +2177,7 @@ msgid "Detail"
 msgstr "Λεπτομέρεια"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Ενοποίηση"
 
@@ -2329,21 +2271,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Ο βασικός λογαριασμός για φορολογική δήλωση"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -2360,8 +2297,7 @@ msgid "Unreconcile"
 msgstr "Ακύρωση Συμφωνίας"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Τύπος Φόρου"
 
@@ -2371,8 +2307,7 @@ msgid "Statement Entries"
 msgstr "Εγγραφές Δήλωσης"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Χρήστης"
 
@@ -2462,8 +2397,7 @@ msgid "Date End"
 msgstr "Ημερομηνία Λήξης"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2471,8 +2405,7 @@ msgid "Entry Lines"
 msgstr "Γραμμές Εγγραφής"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Applicable Code (if type=code)"
 
@@ -2561,11 +2494,9 @@ msgstr "Δημιουργία τιμολογίου από αναλυτικούς
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2584,8 +2515,7 @@ msgstr "Δημιουργία τιμολογίου από αναλυτικούς
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -2595,10 +2525,8 @@ msgid "Acc. Type Name"
 msgstr "Όνομα Τύπου Λογαρ."
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2612,8 +2540,7 @@ msgid "Litigation"
 msgstr "Αντιδικία"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Πληροφορία"
@@ -2731,8 +2658,7 @@ msgid "Price"
 msgstr "Τιμή"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2799,17 +2725,13 @@ msgid "Invoice Reference"
 msgstr "Παραπομπή Τιμολογίου"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Όνομα"
@@ -2852,8 +2774,7 @@ msgstr ""
 "έχετε φόρους που περιέχεουν άλλους φόρους σαν υποκατηγορίες."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2946,16 +2867,11 @@ msgid "Full Account Name"
 msgstr "Πλήρες Όνομα Λογαριασμού"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2976,9 +2892,7 @@ msgid "Document: Customer account statement"
 msgstr "Έγγραφο: Λογιστική κατάσταση πελάτη"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Λογιστική"
 
@@ -3023,10 +2937,8 @@ msgid "Centralisation"
 msgstr "Συγκεντροποίηση"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Κωδικός Φόρου"
@@ -3069,14 +2981,12 @@ msgstr ""
 "ημερομηνία καταχώρησης συν τον όρο πληρωμής του συνεργάτη."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Κατάσταση"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Έγγραφο"
 
@@ -3116,8 +3026,7 @@ msgid "Cancel selected invoices"
 msgstr "Ακύρωση επιλεγμένων παραστατικών"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3140,28 +3049,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Ορισμός σε προσωρινή"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Παραπομπή στο έγγραφο που δημιούργησε αυτό το τιμολόγιο."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Πληρωτέο"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Βάση"
 
@@ -3171,8 +3075,7 @@ msgid "Model Name"
 msgstr "Όνομα Μοντέλου"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Άλλα"
 
@@ -3182,15 +3085,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Επικύρωση"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Υπόμνημα"
 
@@ -3205,17 +3106,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3236,12 +3134,9 @@ msgid "By Date and Period"
 msgstr "Κατά ημερομηνία και περίοδο"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Σημειώσεις"
@@ -3256,8 +3151,7 @@ msgstr ""
 "πληρωμές."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3282,21 +3176,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Η κωδικοποίηση της κίνησης παράγει εγγραφές πληρωτέων"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Κωδικός"
 
@@ -3306,8 +3194,7 @@ msgid "Financial Management"
 msgstr "Οικονομική Διαχείριση"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Κανένα"
@@ -3335,8 +3222,7 @@ msgid "Additionnal Information"
 msgstr "Επιπλέον Πληροφορίες"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Όνομα Φόρου"
@@ -3413,8 +3299,7 @@ msgid "Partner Balance"
 msgstr "Υπόλοιπο Συνεργάτη"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Βιβλίο Τρίτων"
 
@@ -3429,8 +3314,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3469,8 +3353,7 @@ msgid "Import invoice"
 msgstr "Εισαγωγή Τιμολογίου"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Δημιουργία"
@@ -3486,8 +3369,7 @@ msgid "Invoice line"
 msgstr "Γραμμή Τιμολογίου"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Συντόμευση"
 
@@ -3517,15 +3399,13 @@ msgstr ""
 "για εγγαρφή πολλαπλών νομισμάτων."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Λογαριασμός Μητρικού Φόρου"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3561,8 +3441,7 @@ msgid "Central Journal"
 msgstr "Κεντρικό Ημερολόγιο"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Υπόλοιπο από μεταφορά"
 
@@ -3638,8 +3517,7 @@ msgid "Journal code"
 msgstr "Κωδικός Ημερολογίου"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Δημιουργία εγγραφών"
 
@@ -3699,14 +3577,11 @@ msgstr ""
 "σχετίζεται με αυτό τον Κωδικό Φόρου."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Ιεράρχηση"
@@ -3774,8 +3649,7 @@ msgstr "Προεγγραφή λογαριασμού"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Ημερ/νία Λήξης"
 
@@ -3795,8 +3669,7 @@ msgid "Account Configure Wizard "
 msgstr "Αυτόματος Οδηγός Παραμετροποίησης Λογαριασμών "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Ημερ/νία Έναρξης"
@@ -3834,8 +3707,7 @@ msgid "Unreconciled"
 msgstr "Μη συμφωνημένα"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Σημείωση"
 
@@ -3868,8 +3740,7 @@ msgid "Entry Sequence"
 msgstr "Ιεράρχηση Εγγραφών"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Κλεισμένα"
 
@@ -3999,12 +3870,9 @@ msgid "Code/Date"
 msgstr "Κωδικός/ Ημερομ."
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Ενεργό"
@@ -4056,20 +3924,15 @@ msgid "Secondary Currency"
 msgstr "Δευτερεύων Νόμισμα"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4102,8 +3965,7 @@ msgid "Account Move"
 msgstr "Κίνηση Λογαριασμού"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Γραμμές κίνησης"
 
@@ -4200,18 +4062,15 @@ msgid "Journal Column"
 msgstr "Στήλη Ημερολογίου"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4224,8 +4083,7 @@ msgid "Periods"
 msgstr "Περίοδοι"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4253,8 +4111,7 @@ msgstr ""
 "Αναλυτικό κόστος για επανατιμολόγηση αγορών, φύλλα χρόνου εργασίας κλπ."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Προεπιλεγμένοι Φόροι"
 
@@ -4314,8 +4171,7 @@ msgstr "Είδος ελέγχου"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Όνομα Λογαριασμού"
 
@@ -4406,8 +4262,7 @@ msgid "Import file from your bank statement"
 msgstr "Εισαγωγή αρχείου από τραπεζικό λογαριασμό"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Εσωτερικός Τύπος"
 
@@ -4433,14 +4288,12 @@ msgid "Posted"
 msgstr "Αποθηεκευμένη"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Πιστωτικά Τιμολόγια"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Ημερομηνία Λήξης"
 
@@ -4461,8 +4314,7 @@ msgid "Day of the Month"
 msgstr "Ημέρα του Μήνα"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Γραμμές"
 
@@ -4483,8 +4335,7 @@ msgstr ""
 "έχετε φόρους που περιέχεουν άλλους φόρους σαν υποκατηγορίες."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Φορολογική Δήλωση"
 
@@ -4544,14 +4395,12 @@ msgid "The optional quantity on entries"
 msgstr "Η προαιρετική ποσότητα στις εγγραφές"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Καταστάσεις"
 
@@ -4587,8 +4436,7 @@ msgstr "Ημερ/νία Έναρξης"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -4707,11 +4555,9 @@ msgstr "Έγκυρες Εγρραφές από τιμολόγιο"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4808,12 +4654,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Εκτύπωση ενηλικιωμένου δοκιμαστικού ισοζυγίου"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Παρ."
 
@@ -4893,8 +4736,7 @@ msgid "Control Invoice"
 msgstr "Έλεγχος Τιμολογίου"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Εισπρακτέα"
@@ -4921,8 +4763,7 @@ msgstr "ΦΠΑ:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Σύνολο:"
@@ -4933,8 +4774,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Χαρτογράφηση λογαριασμών"
@@ -4950,8 +4790,7 @@ msgid "Account Reconciliation"
 msgstr "Συμφωνία Λογαριασμών"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
@@ -4966,8 +4805,7 @@ msgid "Parent Account Template"
 msgstr "Πρότυπο Μητρικού Λογαριασμού"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4988,8 +4826,7 @@ msgid "Analytic account"
 msgstr "Αναλυτικός Λογαριασμός"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Τιμολόγιο Προμηθευτή"
 
@@ -4999,22 +4836,16 @@ msgid "Valid"
 msgstr "Έγκυρο"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Χρέωση"
@@ -5076,8 +4907,7 @@ msgid "Reporting"
 msgstr "Αναφορές"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5108,8 +4938,7 @@ msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Συνολικό ποσό"
 
@@ -5160,14 +4989,12 @@ msgid "Paid invoice"
 msgstr "Εξοφλημένο τιμολόγιο"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Ορισμός Φόρου"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Ομάδα Φόρου"
 
@@ -5211,8 +5038,7 @@ msgid "With movements"
 msgstr "Με κινήσεις"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Τομέας"
 
@@ -5237,9 +5063,7 @@ msgid "Manually"
 msgstr "Χειροκίνητα"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5256,8 +5080,7 @@ msgid "Payable Accounts"
 msgstr "Λογαριασμοί Πληρωτέοι"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Γραμμή Τιμολογίου"
 
@@ -5305,12 +5128,10 @@ msgstr "Πρόσημο στις Αναφορές"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
-"Το προαιρετικό νόμισμα αν πρόκειται για εγγραφή πολλαπλών νομισμάτων."
+msgstr "Το προαιρετικό νόμισμα αν πρόκειται για εγγραφή πολλαπλών νομισμάτων."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Πληρωμές"
@@ -5356,12 +5177,9 @@ msgstr "Επιλογή ημερολογίου και Ημερομηνίας Πλ
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Προσωρινό"
@@ -5388,8 +5206,7 @@ msgid "Are you sure ?"
 msgstr "Είστε σίγουρος;"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5427,22 +5244,16 @@ msgid "Supplier Invoice Process"
 msgstr "Διεργασία Τιμολογίων Προμηθευτή"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Σελίδα"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Προαιρετική Πληροφορία"
 
@@ -5458,8 +5269,7 @@ msgid "Receivable and Payable"
 msgstr "Εισπρακτέα & Πληρωτέα"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5484,8 +5294,7 @@ msgstr ""
 "λογαριασμός βάσης του φόρου θα περιέχει το αφορολόγητο ποσό."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Υπολογισμός"
@@ -5493,8 +5302,7 @@ msgstr "Υπολογισμός"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
-"Ο λογαριασμός εσόδων ή εξόδων που σχετίζεται με το επιλεγμένο προϊόν."
+msgstr "Ο λογαριασμός εσόδων ή εξόδων που σχετίζεται με το επιλεγμένο προϊόν."
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -5530,8 +5338,7 @@ msgid "End of period"
 msgstr "Τέλος Περιόδου"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Εγγραφή Λογαριασμού"
 
@@ -5542,8 +5349,7 @@ msgid "General Journal"
 msgstr "Γενικό Ημερολόγιο"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5551,12 +5357,9 @@ msgstr "Γενικό Ημερολόγιο"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Υπόλοιπο"
@@ -5604,11 +5407,8 @@ msgstr ""
 "ημερολόγιο"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Γενικές Πληροφορίες"
 
@@ -5650,8 +5450,7 @@ msgid "List of Accounts"
 msgstr "Λίστα Λογαριασμών"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Χαρακτηριστικά Πωλήσεων"
 
@@ -5744,15 +5543,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -5800,8 +5595,7 @@ msgstr ""
 "παρών συνεργάτη αντί του προεπιλεγμένου."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Κωδικός Θέματος"
 
@@ -5883,8 +5677,7 @@ msgstr "Ορισμός Μοντέλων"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Μετρητά"
 
@@ -5924,8 +5717,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Αφήστε το κενό για όλες τις ανοικτές Λογιστικές Χρήσεις"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Επιστροφή Χρημάτων από Προμηθευτή"
 
@@ -5974,10 +5766,8 @@ msgstr ""
 "αποθεμάτων για την τρέχουσα κατηγορία προϊόντων"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -6011,10 +5801,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Όνομα Λογιστική Χρήση όπως εμφανίζεται στην οθόνη"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6071,8 +5859,7 @@ msgstr "Ναι"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Επιλέξτε αυτό αν ο χρήστης επιτρέπεται να συμφωνεί εγγραφές στο λογαριασμό "
 "αυτό."
@@ -6082,28 +5869,377 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 
-#, python-format
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Αναλυτικοί λογαριασμοί για κλείσιμο"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Πρόχειρα τιμολόγια"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Πίνακας Αναφορών Λογιστικής"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Λογαριασμοί για τιμολόγηση"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Κόστη για τιμολόγηση"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Παλαιωμένα εισπρακτέα"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Πίνακας Λογιστηρίου"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Λογαριασμοί Εσόδων"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Οι δείκτες μου"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Πίνακας Λογαριασμού"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Παλαιωμένα έσοδα"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Προβολή Πληροφοριών Χρέωσης/Πίστωσης"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Όλοι οι λογαριασμοί"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Επιλογή Εγγραφών Βασισμένων σε"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Υπενθύμιση"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Οικονομική Περίοδος"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Ισοζύγιο Λογαριασμού"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Επιλέξτε Περίοδο(ους)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Ποσοστό"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Σύγκριση Επιλεγμένων Ετών σε Όρους"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Επιλογή Λογιστικού Έτους(ων) (Μέγιστο Τρία Έτη)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Επιλέξτε Λογαριασμό Αναφοράς (για % σύγκρισης)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Ισοζύγιο Λογαριασμού-Σύγκριση Ετών"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Το κομμάτι Ισολογισμών είναι ένα επιπρόσθετο λειτουργικό κομμάτι στο κομμάτι "
+"της Οικονομικής Διαχείρισης\n"
+"\n"
+"    Αυτό το κομμάτι σου δίνει διάφορες επιλογές για εκτύπωση ισολογισμών.\n"
+"\n"
+"    1. Μπορείς να συγκρίνεις τους ισολογισμούς διαφόρων ετών.\n"
+"\n"
+"    2. Μπορείς να ορίσεις την απόλυτη ή επί τοις εκατό σύγκριση μεταξύ δύο "
+"ετών.\n"
+"\n"
+"    3. Μπορείς να ορίσεις το ισολογισμό αναφοράς για την επί τοις εκατό "
+"σύγκριση συγκεκριμένων ετών.\n"
+"\n"
+"    4. Μπορείς να επιλέξεις περιόδους ως πραγματική ημερομηνία ή περιόδους "
+"ως ημέρα δημιουργίας.\n"
+"\n"
+"    5. Έχεις δυνατότητα να εκτυπώσεις την επιθυμητή αναφορά σε μορφή "
+"Landscape.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Θα πρέπει να επιλέξτε την επιλογή 'Landscape'. Παρακαλώ επιλέξτε την."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Εμφάνση Αναφοράς σε Φόρμα Landscape"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Σύνολο:"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Εμφάνιση Σύγκρισης σε %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Επιλογή Περιόδου"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Επιλογές Αναφοράς"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Χωρίς Σύγκριση"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Εμφάνιση Λογαριασμών"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Έχετε επιλέξτε περισσότερα απο 3 έτη σε κάθε περίπτωση."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Λογιστική και οικονομική διαχείριση - Σύγκριση λογαριασμών"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Έτος :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Μπορείτε να επιλέξετε το πολύ 3 έτη. Παρακαλώ ελέγξτε ξανά."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Έχετε επιλέξτε επιλογή 'Ποσοστό' με περισσότερα απο 2 έτη, αλλα δεν έχετε "
+"επιλέξει διάταξη landscape."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Μπορεί να έχετε κάνει τα ακόλουθα λάθη. Παρακαλώ διορθώστε και "
+"ξαναπροσπαθήστε."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Διατηρήστε κενα για σύγκριση με κατηγορίες"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. Δεν έχετε επιλέξει 'Ποσοστό', αλλα έχετε επιλέξει περισσότερο απο 2 έτη."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Μπορεί να επιλέξατε την επιλογή σύγκρισης με περισσότερα απο 1 έτη με στήλες "
+"χρέωσης/πίστωσης και %. Αυτό μπορεί να οδηγήσει σε περιεχόμενα που θα "
+"εκτυπωθούν πέρα απο τα όρια του χαρτιού. Παρακαλώ επιλέξτε ξανά."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Θα πρέπει να επιλέξετε τουλάχιστον 1 λογιστικό έτος. Προσπαθήστε ξανά."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Παραμετροποίηση Αναφοράς"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Διάρκεια μηνός"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Αναφορά τιμολογίων των τελευταίων 15 ημερών"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Σύνολο"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Λογαριασμοί με βάση τον τύπο"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Παλαιωμένα εισπρακτέα μέχρι σήμερα"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Εισπρακτέοι λογαριασμοί"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Εύρος"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Ένα πρόσθετο με νέες αναφορές βασισμένο στο account module"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Αναφορές Λογαρισμών - Αναφορές"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Ισοζύγιο κατα Τύπο Λογαριασμού"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Εβδομάδα Έτους"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Παλαιωμένα εισπρακτέα"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Αφορολόγητο Ποσό"
+
 #~ msgid "Integrity Error !"
 #~ msgstr "Σφάλμα Ακεραιότητας !"
 
-#, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Η κίνηση λογαριασμού στην γραμμή \"%s\" δεν είναι έγκυρη"
 
-#, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
 #~ "Δεν έχει καθοριστεί ημερολόγιο τέλους εγγραφών για την διαχειριστική χρήση"
 
-#, python-format
 #~ msgid "No Period found on Invoice!"
 #~ msgstr "Καμία Περίοδος δεν βρέθηκε στο τιμολόγιο!"
 
-#, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "Κανένα αναλυτικό ημερολόγιο!"
 
-#, python-format
 #~ msgid "No period found !"
 #~ msgstr "Δεν βρέθηκε περίοδος!"
 
@@ -6112,47 +6248,41 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 
 #~ msgid ""
 #~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
+#~ "consider the present one as void. Do not hesitate to contact our "
+#~ "accounting departement at +32 81 81 37 00."
 #~ msgstr ""
 #~ "Εφόσον έχετε τακτοποιήσει την πληρωμή μετά την αποστολή αυτής της "
 #~ "αλληλογραφίας, παρακαλούμε θεωρείστε την παρούσα άκυρη. Παρακαλούμε μην "
 #~ "διστάσετε να επικοινωνήσετε με το λογιστήριο στο +32 81 81 37 00."
 
-#, python-format
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr ""
 #~ "Δεν μπορείτε να χρησιμοποιήσετε αυτόν τον γενικό λογαριασμό σε αυτό το "
 #~ "ημερολόγιο!"
 
-#, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Ημερολόγιο Τράπεζας "
 
-#, python-format
 #~ msgid "You can not add/modify entries in a closed journal."
 #~ msgstr ""
-#~ "Δεν μπορείτε να προσθέσετε/τροποποιήσετε εγγραφές σε ένα κλειστό ημερολόγιο."
+#~ "Δεν μπορείτε να προσθέσετε/τροποποιήσετε εγγραφές σε ένα κλειστό "
+#~ "ημερολόγιο."
 
-#, python-format
 #~ msgid "You must first select a partner !"
 #~ msgstr "Θα πρέπει πρώτα να επιλέξετε συνεργάτη!"
 
-#, python-format
 #~ msgid "No Data Available"
 #~ msgstr "Δεν υπάρχει διαθέσιμη πληροφορία"
 
-#, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr ""
 #~ "Το αναμενόμενο ισοζύγιο (%.2f) είναι διαφορετικό απο αυτό που έχει "
 #~ "υπολογιστεί. (%.2f)"
 
-#, python-format
 #~ msgid ""
-#~ "You can not do this modification on a confirmed entry ! Please note that you "
-#~ "can just change some non important fields !"
+#~ "You can not do this modification on a confirmed entry ! Please note that "
+#~ "you can just change some non important fields !"
 #~ msgstr ""
 #~ "Δεν μπορείτε να τροποποίησετε σε μιά επιβεβαιωμένη εγγραφή! Παρακαλώ "
 #~ "σημειώστε ότι μπορείτε απλά να αλλάξετε κάποια μή σημαντικά πεδία!"
@@ -6160,14 +6290,12 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ msgid "Crédit"
 #~ msgstr "Πίστωση"
 
-#, python-format
 #~ msgid "Purchase Journal"
 #~ msgstr "Ημερολόγιο Αγορών"
 
 #~ msgid "Error! You can not create recursive account."
 #~ msgstr "Σφάλμα! Δεν μπορείτε να δημιουργήσετε επαναλαμβανόμενο λογαριασμό."
 
-#, python-format
 #~ msgid ""
 #~ "You can not do this modification on a reconciled entry ! Please note that "
 #~ "you can just change some non important fields !"
@@ -6175,57 +6303,47 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ "Δεν μπορείτε να κάνετε αυτήν την τροποποίηση σε μιά συμφωνημένη εγγραφή! "
 #~ "Σημειώστε ότι μπορείτε απλά να αλλάξετε κάποια μή σημαντικά πεδία!"
 
-#, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr ""
 #~ "Το ανοιγόμενο ημερολόγιο δεν θα πρέπει να έχει καμία εγγραφή στο νέο "
 #~ "λογιστικό έτος!"
 
-#, python-format
 #~ msgid "You must select accounts to reconcile"
 #~ msgstr "Πρέπει να επιλέξετε λογαριασμούς για συμφωνία"
 
-#, python-format
 #~ msgid "Entries are not of the same account or already reconciled ! "
-#~ msgstr "Οι εγγραφές δεν είναι του ίδιου λογαριασμού ή έχουν ήδη συμφωνηθεί! "
+#~ msgstr ""
+#~ "Οι εγγραφές δεν είναι του ίδιου λογαριασμού ή έχουν ήδη συμφωνηθεί! "
 
-#, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr ""
 #~ "Δεν μπορείτε να διαγράψετε τιμολόγιο(α) που έχουν ήδη ανοιχτεί ή πληρωθεί!"
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Άκυρη ενέργεια!"
 
-#, python-format
 #~ msgid "Unable to find a valid period !"
 #~ msgstr "Αδύνατη η εύρεση ορθής περιόδου!"
 
 #~ msgid "Débit"
 #~ msgstr "Χρέωση"
 
-#, python-format
 #~ msgid "Configration Error !"
 #~ msgstr "Σφάλμα Παραμετροποίησης!"
 
-#, python-format
 #~ msgid "Sales Journal"
 #~ msgstr "Ημερολόγιο Πωλήσεων"
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Σφάλμα !"
 
-#, python-format
 #~ msgid ""
-#~ "Specified Journal does not have any account move entries in draft state for "
-#~ "this period"
+#~ "Specified Journal does not have any account move entries in draft state "
+#~ "for this period"
 #~ msgstr ""
 #~ "Το επιλεγμένο ημερολόγιο δεν περιέχει προσωρινές εγγραφές για την "
 #~ "συγκεκριμένη περίοδο"
 
-#, python-format
 #~ msgid ""
 #~ "You can not modify a posted entry of this journal !\n"
 #~ "You should set the journal to allow cancelling entries if you want to do "
@@ -6233,18 +6351,15 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ msgstr ""
 #~ "Δεν μπορείτε να μεταβάλλεται μια ήδη αποθηεκευμένη εγγραφή αυτού του "
 #~ "ημερολογίου !\n"
-#~ "Πρέπει να ορίσετε το ημερολόγιο έτσι ώστε να επιτρέπει ακύρωση εγγραφών αν "
-#~ "θελετε κάτι τέτοιο."
+#~ "Πρέπει να ορίσετε το ημερολόγιο έτσι ώστε να επιτρέπει ακύρωση εγγραφών "
+#~ "αν θελετε κάτι τέτοιο."
 
-#, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "Πρέπει να ορίσετε λογαριασμό για την καταχώρηση της παραγραφής"
 
-#, python-format
 #~ msgid "Warning !"
 #~ msgstr "Προσοχή!"
 
-#, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
 #~ "The real total does not match the computed total."
@@ -6252,37 +6367,31 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ "Παρακαλώ ελέγξετε την αξία του τιμολογίου!\n"
 #~ "Το πραγματικό σύνολο δεν συμπίπτει με την υπολογιζόμενη τιμή."
 
-#, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Δεν μπορείτε να διαγράψετε κινήσεις που έχουν αποθηκευθεί: \"%s\"!"
 
-#, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Αδύνατη η %s προσωρινού/προφόρμα/ακυρωμένου τιμολογίου"
 
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
 
-#, python-format
 #~ msgid "No sequence defined in the journal !"
 #~ msgstr "Καμία Ιεράρχηση δεν έχει καθοριστεί σε αυτό το ημερολόγιο!"
 
-#, python-format
 #~ msgid ""
 #~ "Can not create an automatic sequence for this piece !\n"
 #~ "\n"
-#~ "Put a sequence in the journal definition for automatic numbering or create a "
-#~ "sequence manually for this piece."
+#~ "Put a sequence in the journal definition for automatic numbering or "
+#~ "create a sequence manually for this piece."
 #~ msgstr ""
 #~ "Αδύνατη η δημιουργία αυτόματης ιεράρχησης στο κομμάτι αυτό!\n"
 #~ "Ορίστε μια Ιεράρχηση στον ορισμό του ημερολογίου για αυτόματη αρίθμηση, ή "
 #~ "τηρείστε χειροκίνητη αρίθμηση για το κομμάτι αυτό."
 
-#, python-format
 #~ msgid "End of Fiscal Year Entry"
 #~ msgstr "Εγγραφές Κλεισίματος Λογιστικής Χρήσης"
 
-#, python-format
 #~ msgid ""
 #~ "No period defined for this date !\n"
 #~ "Please create a fiscal year."
@@ -6290,11 +6399,9 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ "Δεν έχει οριστεί περίοδος για τη συγκεκριμένη ημερομηνία\n"
 #~ "Παρακαλώ δημιουργήστε μια Λογιστική Χρήση"
 
-#, python-format
 #~ msgid "The old fiscal year does not have any entry to reconcile!"
 #~ msgstr "Η παλαιά Λογιστική Χρήση δεν περιέχει εγγραφές για συμφωνία"
 
-#, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
 #~ "Please create one."
@@ -6302,133 +6409,108 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ "Η ημερομηνία δεν ανήκει σε Λογιστική Χρήση.\n"
 #~ "Παρακαλώ δημιουργήστε μία."
 
-#, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Η ημερομηνία δεν ανήκει σε Λογιστική Χρήση"
 
-#, python-format
 #~ msgid "Closing of fiscal year cancelled, please check the box !"
 #~ msgstr ""
 #~ "Το κλείσιμο της Λογιστικής Χρήσης ακυρώθηκε, παρακαλώ κάντε τικ στο κουτί!"
 
-#, python-format
 #~ msgid "You can not validate a non-balanced entry !"
 #~ msgstr "Δεν μπορείτε να επικυρώσετε μιά μή αντιλογισμένη εγγραφή!"
 
-#, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr ""
 #~ "Αδύνατη η δημιουργία κινήσεων τιμολογίου σε συγκεντροποιημένο ημερολόγιο"
 
-#, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Το υπόλοιπο του παραστατικού είναι εσφαλμένο\n"
 
-#, python-format
 #~ msgid "Free Reference"
 #~ msgstr "Ελεύθερη Παραπομπή"
 
-#, python-format
 #~ msgid "No Partner Defined !"
 #~ msgstr "Δεν ορίστηκε Συνεργάτης!"
 
-#, python-format
 #~ msgid "Your journal must have a default credit and debit account."
 #~ msgstr ""
-#~ "Το ημερολόγιο σας πρέπει να έχει έναν προκαθορισμένο λογαριασμό χρέωσης και "
-#~ "πίστωσης."
+#~ "Το ημερολόγιο σας πρέπει να έχει έναν προκαθορισμένο λογαριασμό χρέωσης "
+#~ "και πίστωσης."
 
-#, python-format
 #~ msgid "The journal must have default credit and debit account"
 #~ msgstr ""
-#~ "Το ημερολόγιο πρέπει να έχει προεπιλεγμένους λογαρισμούς χρέωσης - πίστωσης"
+#~ "Το ημερολόγιο πρέπει να έχει προεπιλεγμένους λογαρισμούς χρέωσης - "
+#~ "πίστωσης"
 
 #~ msgid "Keep empty to use the period of the validation date."
 #~ msgstr "Αφήστε το κενό για χρήση της περιόδου επικύρωσης"
 
-#, python-format
 #~ msgid "Some entries are already reconciled !"
 #~ msgstr "Κάποιες εγγραφές είναι ήδη συμφωνημένες"
 
-#, python-format
 #~ msgid "No Analytic Journal !"
 #~ msgstr "Δεν ορίστηκε Αναλυτικό Ημερολόγιο!"
 
-#, python-format
 #~ msgid "Already Reconciled"
 #~ msgstr "Ήδη Συμφωνημένα"
 
-#, python-format
 #~ msgid "Unable to change tax !"
 #~ msgstr "Αδύνατη η αλλαγή φόρου"
 
-#, python-format
 #~ msgid ""
-#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
-#~ "defined !"
+#~ "The Payment Term of Supplier does not have Payment Term Lines"
+#~ "(Computation) defined !"
 #~ msgstr "Δεν έωουν οριστεί Γραμμές Υπολογισμού Όρων Πληρωμής στο Συνεργάτη!"
 
-#, python-format
 #~ msgid "No records found for your selection!"
 #~ msgstr "Δε βρέθηκαν δεδομένα για την επιλογή σας!"
 
-#, python-format
 #~ msgid "The account entries lines are not in valid state."
 #~ msgstr ""
 #~ "Οι γραμμές εγγραφών του λογαριασμού δεν βρίσκονται σε έγκυρη κατάσταση"
 
-#, python-format
 #~ msgid "Unable to reconcile entry \"%s\": %.2f"
 #~ msgstr "Αδύνατη η συμφωνία της εγγραφής \"%s\": %.2f"
 
-#, python-format
 #~ msgid "Please set an analytic journal on this financial journal !"
 #~ msgstr ""
-#~ "Παρακαλώ ορίστε ένα αναλυτικό ημερολόγιο για αυτό το οικονομικό ημερολόγιο!"
+#~ "Παρακαλώ ορίστε ένα αναλυτικό ημερολόγιο για αυτό το οικονομικό "
+#~ "ημερολόγιο!"
 
-#, python-format
 #~ msgid "EXJ"
 #~ msgstr "EXJ"
 
-#, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Η \"ημερομηνία σε\" πρέπει να οριστεί ανάμεσα στην %s και την %s"
 
 #~ msgid "Move name"
 #~ msgstr "Όνομα κίνησης"
 
-#, python-format
 #~ msgid "You can not modify/delete a journal with entries for this period !"
 #~ msgstr ""
-#~ "Αδύνατη η τροποποίηση/διαγραφή ημερολογίου με εγγραφές σε αυτή την περίοδο!"
+#~ "Αδύνατη η τροποποίηση/διαγραφή ημερολογίου με εγγραφές σε αυτή την "
+#~ "περίοδο!"
 
-#, python-format
 #~ msgid "Invoice is already reconciled"
 #~ msgstr "Το τιμολόγιο είναι ήδη συμφωνημένο"
 
-#, python-format
 #~ msgid "BNK"
 #~ msgstr "BNK"
 
-#, python-format
 #~ msgid "Entries: "
 #~ msgstr "Εγγραφές: "
 
-#, python-format
 #~ msgid "The account is not defined to be reconcile !"
 #~ msgstr "Ο λογαριασμός δεν έχει οριστεί να συμφωνεί!"
 
-#, python-format
 #~ msgid "Couldn't create move between different companies"
 #~ msgstr "Αδύνατη η δημιουργία κίνησης μεταξύ διαφορετικών εταιρειών"
 
-#, python-format
 #~ msgid "You can not change the tax, you should remove and recreate lines !"
 #~ msgstr ""
 #~ "Δεν μπορείτε να αλλάξετε το φόρο, πρέπει να διαγράψετε και να "
 #~ "επαναδημιουργήσετε τις γραμμές!"
 
-#, python-format
 #~ msgid ""
 #~ "You have to define the bank account\n"
 #~ "in the journal definition for reconciliation."
@@ -6436,20 +6518,16 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ "Πρέπει να ορίσετε στον ορισμό του ημερολογίου\n"
 #~ "τον τραπεζικό λογαριασμό για συμφωνία."
 
-#, python-format
 #~ msgid "Entry \"%s\" is not valid !"
 #~ msgstr "Η εγγραφή \"%s\" δεν είναι έγκυρη!"
 
-#, python-format
 #~ msgid "Global taxes defined, but are not in invoice lines !"
 #~ msgstr ""
 #~ "Οι φόροι έχουν οριστεί γενικά αλλά δε βρίσκονται στις γραμμές τιμολογίου!"
 
-#, python-format
 #~ msgid "Bad total !"
 #~ msgstr "Λάθος Σύνολο!"
 
-#, python-format
 #~ msgid "Data Insufficient !"
 #~ msgstr "Έλλειψη Δεδομένων"
 
@@ -6462,6 +6540,17 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ msgid "Closing Balance"
 #~ msgstr "Υπόλοιπο Κλεισίματος"
 
-#, python-format
 #~ msgid "SAJ"
 #~ msgstr "SAJ"
+
+#~ msgid "at"
+#~ msgstr "σε"
+
+#~ msgid "Printing date:"
+#~ msgstr "Ημερομηνία εκτύπωσης:"
+
+#~ msgid "Account Information"
+#~ msgstr "Πληροφορίες Λογαριασμού"
+
+#~ msgid "Currency:"
+#~ msgstr "Νόμισμα:"
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index f576c8ffa45..c06407ce158 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-24 10:03+0000\n"
+"PO-Revision-Date: 2010-06-29 22:11+0000\n"
 "Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -6076,5 +6076,364 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Calcular fechas asiento"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Cuentas analíticas a cerrar"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Facturas borrador"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Cuentas a facturar"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Efectos vencidos a cobrar"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Tablero para contables"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Cuentas de ingresos"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Mis indicadores"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Ingresos vencidos"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostrar información débito/crédito"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas las cuentas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selección de entradas basada en"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificación"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periodo financiero"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balance contable"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Seleccione período(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparar ejercicios seleccionados en términos de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Seleccionar ejercicio(s) fiscal(es) (máximo 3 años)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Seleccione cuenta de referencia (para comparación %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Balance contable-Compara ejercicios"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"El módulo de balance de cuentas es una funcionalidad añadida al módulo de "
+"gestión financiera.\n"
+"\n"
+"    Este módulo ofrece diversas opciones de impresión de balances.\n"
+"\n"
+"    1. Se puede comparar el balance de distintos años.\n"
+"\n"
+"    2. Puede establecer la comparación en importe o porcentual entre dos "
+"años.\n"
+"\n"
+"    3. Puede establecer la cuenta de referencia para la comparación "
+"porcentual para años en particular.\n"
+"\n"
+"    4. Puede seleccionar períodos como una fecha real o períodos como fecha "
+"de creación.\n"
+"\n"
+"    5. Puede imprimir el informe que desee en formato apaisado.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Debe seleccionar la opción 'Horizontal'. Por favor, márquela."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar informe en formato horizontal"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparación en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opciones del informe"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "No comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar cuentas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Ha seleccionado más de 3 ejercicios en cualquier caso."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Gestión contable y financiera - Comparación de cuentas"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Ejercicio :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Puede seleccionar un máximo de 3 ejercicios. Por favor, seleccione otra vez."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Ha seleccionado la opción 'Porcentaje' con más de 2 ejercicios, pero no "
+"ha seleccionado formato horizontal."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Podría haber cometido los siguientes errores. Por favor, corríjalos e "
+"inténtelo de nuevo."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Dejarlo vacío para comparar con sus padres"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. No ha seleccionado la opción 'Porcentaje', pero ha seleccionado más de 2 "
+"ejercicios."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+"Puede haber seleccionado las opciones comparar con más de 1 ejercicio con "
+"columnas crédito/débito y opción %. Esto pueden ocasionar que hayan "
+"contenidos que se impriman fuera del papel. Por favor, inténtelo de nuevo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+"Debe seleccionar al menos un ejercicio fiscal. Por favor, inténtelo de nuevo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Informe personalizado"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Rango mensual"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Facturas creadas en los últimos 15 días"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Informe de facturas creadas en los últimos 15 días"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Efectos a cobrar vencidos hasta hoy"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Intervalo"
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+"Módulo que añade nuevos informes basado en el módulo contable-financiero."
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Informe contable - Informe"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo por tipo de cuenta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "A cobrar anteriores"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.asistente"
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 5239c4c67b4..7a8adeea949 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -93,8 +93,7 @@ msgid "Unreconciled entries"
 msgstr "Asientos no conciliados"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Código base"
@@ -126,8 +125,7 @@ msgid "Residual"
 msgstr "Residuo"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -191,10 +189,8 @@ msgid "Move line select"
 msgstr "Seleccionar línea de movimiento"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Etiqueta del asiento"
 
@@ -209,14 +205,12 @@ msgid "Period Sum"
 msgstr "Suma del período"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Código de Cálculo (si tipo=código)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Línea del asiento contable"
 
@@ -233,12 +227,9 @@ msgstr "Asientos recurrentes"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Importe"
@@ -279,8 +270,7 @@ msgstr ""
 "rápido en cada diario."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -294,14 +284,12 @@ msgstr ""
 "vencimiento, por ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fijo"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Pagos atrasados"
 
@@ -317,8 +305,7 @@ msgid "Select period"
 msgstr "Seleccionar período"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origen"
 
@@ -348,8 +335,7 @@ msgid "Delta Debit"
 msgstr "Diferencia debe"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Impuestos"
@@ -368,14 +354,12 @@ msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Impuesto en hijos"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nombre del diario"
@@ -443,11 +427,8 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estado"
@@ -459,8 +440,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Reembolsos de proveedor impagos"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Cálculo especial"
 
@@ -482,10 +462,8 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref."
@@ -683,8 +661,7 @@ msgid "Sub-Total :"
 msgstr "Subtotal :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -716,8 +693,7 @@ msgid "Select the Period for Analysis"
 msgstr "Seleccione el período de análisis"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -749,8 +725,7 @@ msgid "Field Name"
 msgstr "Nombre del Campo"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Signo para el padre"
 
@@ -760,8 +735,7 @@ msgid "End of Year Entries Journal"
 msgstr "Diario de asientos de cierre del año"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propiedades de compra"
 
@@ -781,12 +755,9 @@ msgid "Move Lines Created."
 msgstr "Líneas de movimientos creadas"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Estado"
 
@@ -943,10 +914,8 @@ msgstr "Seleccionar plan de cuentas"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Cantidad"
@@ -989,16 +958,13 @@ msgstr "Factura analítica"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1020,8 +986,7 @@ msgid "Net Total:"
 msgstr "Total Neto:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1145,8 +1110,7 @@ msgid "Fiscal Position Templates"
 msgstr "Plantillas de posiciones fiscales"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Precio unitario"
 
@@ -1305,8 +1269,7 @@ msgid "Not reconciled transactions"
 msgstr "Transacciones no conciliadas"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Asociación impositiva"
@@ -1328,8 +1291,7 @@ msgid "Write-Off account"
 msgstr "Cuenta de cancelación"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelo"
 
@@ -1355,11 +1317,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Seleccionar facturas que desea pagar y gestionar anticipos"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Vista"
 
@@ -1430,8 +1390,7 @@ msgstr "Tipos de cuentas"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1447,8 +1406,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
@@ -1474,8 +1432,7 @@ msgid "Statement reconcile line"
 msgstr "Línea de conciliación de extracto"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Dejar vacío para usar la cuenta de ingresos"
 
@@ -1604,8 +1561,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Dejar vacío para la cuenta de gastos"
 
@@ -1615,8 +1571,7 @@ msgid "Account to reconcile"
 msgstr "Cuenta a conciliar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Referencia Partner"
@@ -1628,14 +1583,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Cuentas a cobrar y pagar"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Líneas de Suscripción"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1800,8 +1753,7 @@ msgid "Period length (days)"
 msgstr "Duración del período (días)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Porcentaje"
@@ -1812,8 +1764,7 @@ msgid "Charts"
 msgstr "Diagramas"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1889,12 +1840,9 @@ msgstr "x Diarionotas de crédito de gastos"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2042,8 +1990,7 @@ msgid "Journal-Period Name"
 msgstr "Nombre diario-período"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nombre del impuesto del caso"
 
@@ -2061,8 +2008,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2137,10 +2083,8 @@ msgstr "Anterior"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Moneda"
@@ -2178,8 +2122,7 @@ msgid "Analytic Entry"
 msgstr "Asiento analítico"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensaje de Pagos Vencidos"
 
@@ -2231,8 +2174,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidación"
 
@@ -2329,21 +2271,16 @@ msgid "The account basis of the tax declaration."
 msgstr "La cuenta base de la declaración de impuestos."
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Fecha"
@@ -2360,8 +2297,7 @@ msgid "Unreconcile"
 msgstr "Desconciliar"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tipo de impuesto"
 
@@ -2371,8 +2307,7 @@ msgid "Statement Entries"
 msgstr "Asientos de extractos"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Usuario"
 
@@ -2462,8 +2397,7 @@ msgid "Date End"
 msgstr "Fecha de finalización"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2471,8 +2405,7 @@ msgid "Entry Lines"
 msgstr "Líneas de asiento"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Código aplicable (si tipo=código)"
 
@@ -2561,11 +2494,9 @@ msgstr "Crear factura desde cuentas analíticas"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2584,8 +2515,7 @@ msgstr "Crear factura desde cuentas analíticas"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2595,10 +2525,8 @@ msgid "Acc. Type Name"
 msgstr "Nombre de tipo cuenta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2612,8 +2540,7 @@ msgid "Litigation"
 msgstr "En Litigio"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Información"
@@ -2730,8 +2657,7 @@ msgid "Price"
 msgstr "Precio"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2798,17 +2724,13 @@ msgid "Invoice Reference"
 msgstr "Referencia de Factura"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -2851,8 +2773,7 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2945,16 +2866,11 @@ msgid "Full Account Name"
 msgstr "Nombre completo de la cuenta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2975,9 +2891,7 @@ msgid "Document: Customer account statement"
 msgstr "Documento: Estado de cuenta del cliente"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Contabilidad"
 
@@ -3022,10 +2936,8 @@ msgid "Centralisation"
 msgstr "Centralización"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Código de impuesto"
@@ -3068,14 +2980,12 @@ msgstr ""
 "los asientos más los términos de pago de la empresa."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situación"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3115,8 +3025,7 @@ msgid "Cancel selected invoices"
 msgstr "Cancelar las facturas seleccionadas"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3139,28 +3048,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Establecer como Borrador"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referencia del documento que ha creado esta factura."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "A pagar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base"
 
@@ -3170,8 +3074,7 @@ msgid "Model Name"
 msgstr "Nombre del Modelo"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Otros"
 
@@ -3181,15 +3084,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Leyenda"
 
@@ -3204,17 +3105,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3235,12 +3133,9 @@ msgid "By Date and Period"
 msgstr "Por fecha y periodo"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notas"
@@ -3255,8 +3150,7 @@ msgstr ""
 "los pagos"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3281,21 +3175,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "La codificación de extractos crea asientos de pago"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Código"
 
@@ -3305,8 +3193,7 @@ msgid "Financial Management"
 msgstr "Gestión financiera"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Ninguno"
@@ -3333,8 +3220,7 @@ msgid "Additionnal Information"
 msgstr "Información adicional"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nombre del Impuesto"
@@ -3411,8 +3297,7 @@ msgid "Partner Balance"
 msgstr "Balance del partner"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Libro mayor de terceros"
 
@@ -3427,8 +3312,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3467,8 +3351,7 @@ msgid "Import invoice"
 msgstr "Importar factura"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Crear"
@@ -3484,8 +3367,7 @@ msgid "Invoice line"
 msgstr "Línea de Facturación"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Acceso directo"
 
@@ -3514,15 +3396,13 @@ msgstr ""
 "moneda."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Cuenta \"padre\""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3558,8 +3438,7 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo a cuenta nueva"
 
@@ -3635,8 +3514,7 @@ msgid "Journal code"
 msgstr "Código del diario"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Crear asientos"
 
@@ -3696,14 +3574,11 @@ msgstr ""
 "código aparezca en las facturas."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Secuencia"
@@ -3771,8 +3646,7 @@ msgstr "Asiento de subscripción"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Fecha vencimiento"
 
@@ -3792,8 +3666,7 @@ msgid "Account Configure Wizard "
 msgstr "Asistente de configuración contabilidad "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Fecha de inicio"
@@ -3831,8 +3704,7 @@ msgid "Unreconciled"
 msgstr "Desconciliada"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Notas"
 
@@ -3865,8 +3737,7 @@ msgid "Entry Sequence"
 msgstr "Secuencia del asiento"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Cerrado"
 
@@ -3996,12 +3867,9 @@ msgid "Code/Date"
 msgstr "Código/Fecha"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Activo"
@@ -4053,20 +3921,15 @@ msgid "Secondary Currency"
 msgstr "Moneda secundaria"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4099,8 +3962,7 @@ msgid "Account Move"
 msgstr "Movimiento de cuenta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Líneas de extracto"
 
@@ -4197,18 +4059,15 @@ msgid "Journal Column"
 msgstr "Columna del diario"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Finalizado"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4221,8 +4080,7 @@ msgid "Periods"
 msgstr "Períodos"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4249,8 +4107,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Costes analíticos para refacturar compras, hojas de tareas, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Impuestos predeterminados"
 
@@ -4309,8 +4166,7 @@ msgstr "Controles de tipo"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nombre de la cuenta"
 
@@ -4401,8 +4257,7 @@ msgid "Import file from your bank statement"
 msgstr "Importar archivo desde extracto bancario"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tipo interno"
 
@@ -4428,14 +4283,12 @@ msgid "Posted"
 msgstr "Publicado"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Notas de Crédito"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Fecha de fin"
 
@@ -4456,8 +4309,7 @@ msgid "Day of the Month"
 msgstr "Día del mes"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Líneas"
 
@@ -4478,8 +4330,7 @@ msgstr ""
 "varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaración de impuestos"
 
@@ -4539,14 +4390,12 @@ msgid "The optional quantity on entries"
 msgstr "La cantidad opcional en los asientos"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Estados"
 
@@ -4582,8 +4431,7 @@ msgstr "Fecha de inicio"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4651,8 +4499,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"Configura automáticamente su plan de cuentas, cuentas bancarias, impuestos "
-"y diarios según la plantilla seleccionada"
+"Configura automáticamente su plan de cuentas, cuentas bancarias, impuestos y "
+"diarios según la plantilla seleccionada"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4702,11 +4550,9 @@ msgstr "Asientos válidos de factura"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4803,12 +4649,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimir balance de comprobación anterior"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4888,8 +4731,7 @@ msgid "Control Invoice"
 msgstr "Controlar factura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "A cobrar"
@@ -4916,8 +4758,7 @@ msgstr "IVA:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4928,8 +4769,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Asociación de cuentas"
@@ -4945,8 +4785,7 @@ msgid "Account Reconciliation"
 msgstr "Conciliación de la cuenta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4961,8 +4800,7 @@ msgid "Parent Account Template"
 msgstr "Plantilla cuenta padre"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4982,8 +4820,7 @@ msgid "Analytic account"
 msgstr "Cuenta analítica"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
@@ -4993,22 +4830,16 @@ msgid "Valid"
 msgstr "Válido"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debe"
@@ -5070,8 +4901,7 @@ msgid "Reporting"
 msgstr "Informes"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5102,8 +4932,7 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Importe total"
 
@@ -5155,14 +4984,12 @@ msgid "Paid invoice"
 msgstr "Factura pagada"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definición de impuestos"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupo de Impuestos"
 
@@ -5205,8 +5032,7 @@ msgid "With movements"
 msgstr "Con movimientos"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Dominio"
 
@@ -5231,9 +5057,7 @@ msgid "Manually"
 msgstr "Manualmente"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5250,8 +5074,7 @@ msgid "Payable Accounts"
 msgstr "Cuentas a pagar"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Línea de factura"
 
@@ -5302,8 +5125,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "La otra moneda opcional si es un asiento multi-moneda."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Pagos"
@@ -5349,12 +5171,9 @@ msgstr "Seleccionar diario y fecha de pago"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Borrador"
@@ -5381,8 +5200,7 @@ msgid "Are you sure ?"
 msgstr "¿Está seguro?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5418,22 +5236,16 @@ msgid "Supplier Invoice Process"
 msgstr "Proceso de facturación a proveedor"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Información opcional"
 
@@ -5449,8 +5261,7 @@ msgid "Receivable and Payable"
 msgstr "A cobrar y pagar"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5476,8 +5287,7 @@ msgstr ""
 "de impuestos base, este campo contendrá el importe base (sin impuestos)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calcular"
@@ -5522,8 +5332,7 @@ msgid "End of period"
 msgstr "Fin del período"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Asiento contable"
 
@@ -5534,8 +5343,7 @@ msgid "General Journal"
 msgstr "Diario general"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5543,12 +5351,9 @@ msgstr "Diario general"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Balance"
@@ -5595,11 +5400,8 @@ msgstr ""
 "La secuencia utilizada para los números de factura en este libro diario."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Información general"
 
@@ -5641,8 +5443,7 @@ msgid "List of Accounts"
 msgstr "Listado de cuentas"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Propiedades de venta"
 
@@ -5735,15 +5536,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -5791,8 +5588,7 @@ msgstr ""
 "pagar para el partner actual."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Código de caso"
 
@@ -5874,8 +5670,7 @@ msgstr "Definición de modelos"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Efectivo"
 
@@ -5915,8 +5710,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Dejar vacío para todos los años fiscales abiertos"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Reembolso de proveedor"
 
@@ -5965,10 +5759,8 @@ msgstr ""
 "producto actual."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -6002,10 +5794,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nombre del año fiscal tal como se muestra en pantalla."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6064,8 +5854,7 @@ msgstr "Sí"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Tilde esta casilla si el usuario se le permite conciliar asientos en esta "
 "cuenta."
@@ -6075,15 +5864,371 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Calcular fechas del asiento"
 
-#, python-format
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Cuentas analíticas a cerrar"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Facturas borrador"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Cuentas a facturar"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "A cobrar anteriores"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Tablero para contaduría"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Cuentas de ingresos"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Mis indicadores"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Ingresos anteriores"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostrar información Debe/Haber"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas las cuentas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selección de asientos basada en"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificación"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periodo financiero"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balance de la cuenta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Seleccionar período(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparar ejercicios seleccionados en términos de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Seleccionar ejercicio(s) fiscal(es) (máximo 3 ejercicios)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selecciona cuenta de referencia (para comparación %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Balance de cuenta - Compara ejercicios"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Módulo de balance de cuentas es una funcionalidad adicional al módulo de "
+"gestión financiera.\n"
+"\n"
+"    Este módulo ofrece las diversas opciones de impresión de hojas de "
+"balance.\n"
+"\n"
+"    1. Se puede comparar el balance de años diferentes.\n"
+"\n"
+"    2. Puede establecer la comparación en importe o porcentual entre dos "
+"años.\n"
+"\n"
+"    3. Puede establecer la cuenta de referencia para la comparación "
+"porcentual para años en particular.\n"
+"\n"
+"    4. Puede seleccionar períodos como una fecha real o períodos como fecha "
+"de creación.\n"
+"\n"
+"    5. Puede imprimir el informe que desee en formato apaisado.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Debe seleccionar la opción 'Horizontal'. Por favor, tilde la casilla."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar informe en formato horizontal"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparación en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selecciona un período"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opciones del Reporte"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "No comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar cuentas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Ha seleccionado más de 3 ejercicios en cualquier algún caso."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Gestión Contable/Financiera-Comparar cuentas"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Puede seleccionar un máximo de 3 ejercicios. Por favor, seleccione otra vez."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Ha seleccionado la opción 'Porcentaje' con más de 2 ejercicios, pero no "
+"ha seleccionado formato horizontal."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Podría haber cometido los siguientes errores. Por favor, corríjalos e "
+"inténtelo de nuevo."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Dejar vacío para comparar con sus padres"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. No ha seleccionado la opción 'Porcentaje', pero ha seleccionado más de 2 "
+"ejercicios."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Puede haber seleccionado las opciones comparar con más de 1 ejercicio con "
+"columnas crédito/débito y opción %. Esto pueden ocasionar que hayan "
+"contenidos que se impriman fuera del papel. Por favor, inténtelo de nuevo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+"Debe seleccionar al menos un ejercicio fiscal. Por favor, inténtelo de nuevo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Personalice el reporte"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Rango mensual"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Facturas creadas en los últimos 15 días"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Informe de facturas creadas en los últimos 15 días"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Cuentas a cobrar hasta hoy"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Rango"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+"Módulo que añade nuevos reportes basado en el módulo contable-financiero."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Informes contable - Informes"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo por tipo de cuenta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "cuentas a cobrar anteriores"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
 #~ msgid "Integrity Error !"
 #~ msgstr "¡Error de integridad!"
 
-#, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "¡Debe indicar una cuenta para el asiento de ajuste!"
 
-#, python-format
 #~ msgid ""
 #~ "Please verify the price of the invoice !\n"
 #~ "The real total does not match the computed total."
@@ -6091,11 +6236,9 @@ msgstr "Calcular fechas del asiento"
 #~ "¡Compruebe el importe de la factura!\n"
 #~ "El importe total real no concuerda con el total calculado."
 
-#, python-format
 #~ msgid "Warning !"
 #~ msgstr "¡Atención!"
 
-#, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "No hay diario analítico !"
 
@@ -6104,28 +6247,25 @@ msgstr "Calcular fechas del asiento"
 
 #~ msgid ""
 #~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
+#~ "consider the present one as void. Do not hesitate to contact our "
+#~ "accounting departement at +32 81 81 37 00."
 #~ msgstr ""
 #~ "Si hay realizado el pago con posterioridad a este aviso, por favor no lo "
-#~ "tenga en cuenta. No dude en contactarnos por cualquier consulta al respecto"
+#~ "tenga en cuenta. No dude en contactarnos por cualquier consulta al "
+#~ "respecto"
 
-#, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Diario bancario "
 
 #~ msgid "Error! You can not create recursive account."
 #~ msgstr "Error! No se puede crear una cuenta recursiva."
 
-#, python-format
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr "¡No puede usar esta cuenta general en este diario!"
 
-#, python-format
 #~ msgid "You can not add/modify entries in a closed journal."
 #~ msgstr "No puede añadir/modificar asientos en un diario cerrado."
 
-#, python-format
 #~ msgid ""
 #~ "You can not do this modification on a reconciled entry ! Please note that "
 #~ "you can just change some non important fields !"
@@ -6133,27 +6273,24 @@ msgstr "Calcular fechas del asiento"
 #~ "¡No puede hacer esta modificación en un asiento conciliado! ¡Observe que "
 #~ "sólo puede cambiar algunos campos no importantes!"
 
-#, python-format
 #~ msgid "You must first select a partner !"
 #~ msgstr "Primero debe seleccionar un partner !"
 
 #~ msgid "account.config.wizard"
 #~ msgstr "asistente.configuracion.contable"
 
-#, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr ""
-#~ "El diario de apertura no debe tener ningún asiento en el nuevo año fiscal !"
+#~ "El diario de apertura no debe tener ningún asiento en el nuevo año "
+#~ "fiscal !"
 
-#, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
 
-#, python-format
 #~ msgid ""
-#~ "You can not do this modification on a confirmed entry ! Please note that you "
-#~ "can just change some non important fields !"
+#~ "You can not do this modification on a confirmed entry ! Please note that "
+#~ "you can just change some non important fields !"
 #~ msgstr ""
 #~ "¡No puede hacer esta modificación en un asiento confirmado! ¡Observe que "
 #~ "sólo puede cambiar algunos campos no importantes!"
@@ -6161,56 +6298,45 @@ msgstr "Calcular fechas del asiento"
 #~ msgid "Crédit"
 #~ msgstr "Haber"
 
-#, python-format
 #~ msgid "Purchase Journal"
 #~ msgstr "Diario de compras"
 
-#, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "El balance del extracto es incorrecto!\n"
 
-#, python-format
 #~ msgid ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr ""
-#~ "Las líneas seleccionadas no tienen ningún movimiento de asientos en borrador"
+#~ "Las líneas seleccionadas no tienen ningún movimiento de asientos en "
+#~ "borrador"
 
-#, python-format
 #~ msgid "UserError"
 #~ msgstr "Error de usuario"
 
-#, python-format
 #~ msgid "No Partner Defined !"
 #~ msgstr "No hay partner definido !"
 
-#, python-format
 #~ msgid "You can not use an inactive account!"
 #~ msgstr "No puede utilizar una cuenta inactiva !"
 
-#, python-format
 #~ msgid "Entries are not of the same account or already reconciled ! "
 #~ msgstr "Asientos no son de la misma cuenta o ya están conciliados ! "
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Acción no válida !"
 
-#, python-format
 #~ msgid "No sequence defined in the journal !"
 #~ msgstr "No se ha definido una secuencia en el diario!"
 
 #~ msgid "Débit"
 #~ msgstr "Debe"
 
-#, python-format
 #~ msgid "Configration Error !"
 #~ msgstr "Error de configuración !"
 
-#, python-format
 #~ msgid "Your journal must have a default credit and debit account."
 #~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
 
-#, python-format
 #~ msgid ""
 #~ "No period defined for this date !\n"
 #~ "Please create a fiscal year."
@@ -6218,75 +6344,58 @@ msgstr "Calcular fechas del asiento"
 #~ "No se ha definido un periodo para esta fecha !\n"
 #~ "Por favor, cree un año fiscal."
 
-#, python-format
 #~ msgid "The journal must have default credit and debit account"
 #~ msgstr "El diario debe tener una cuenta haber y debe predeterminada"
 
 #~ msgid "Keep empty to use the period of the validation date."
 #~ msgstr "Dejar vacío para usar el período de la fecha de validación."
 
-#, python-format
 #~ msgid "Some entries are already reconciled !"
 #~ msgstr "Algunos asientos ya están conciliados !"
 
-#, python-format
 #~ msgid "No Analytic Journal !"
 #~ msgstr "No hay diario analítico !"
 
-#, python-format
 #~ msgid "Already Reconciled"
 #~ msgstr "Ya conciliado"
 
-#, python-format
 #~ msgid "Unable to reconcile entry \"%s\": %.2f"
 #~ msgstr "No es posible conciliar el asiento \"%s\": %.2f"
 
-#, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "No puede eliminar el movimiento publicado: \"%s\"!"
 
-#, python-format
 #~ msgid "The account entries lines are not in valid state."
 #~ msgstr "Las líneas de los asientos contables no están en estado válido."
 
-#, python-format
 #~ msgid "Please set an analytic journal on this financial journal !"
 #~ msgstr "Por favor indique un diario analítico en este diario financiero !"
 
-#, python-format
 #~ msgid "EXJ"
 #~ msgstr "GASTO"
 
-#, python-format
 #~ msgid "Sales Journal"
 #~ msgstr "Diario de ventas"
 
-#, python-format
 #~ msgid "You can not modify/delete a journal with entries for this period !"
 #~ msgstr ""
 #~ "No puede modificar/eliminar un diario con asientos para este periodo !"
 
-#, python-format
 #~ msgid "BNK"
 #~ msgstr "BANCO"
 
-#, python-format
 #~ msgid "The account is not defined to be reconcile !"
 #~ msgstr "La cuenta no está definida para ser conciliada !"
 
-#, python-format
 #~ msgid "Entries: "
 #~ msgstr "Asientos: "
 
-#, python-format
 #~ msgid "Couldn't create move between different companies"
 #~ msgstr "No se pudo crear el movimiento entre empresas distintas"
 
-#, python-format
 #~ msgid "Entry \"%s\" is not valid !"
 #~ msgstr "El asiento \"%s\" no es válido !"
 
-#, python-format
 #~ msgid ""
 #~ "You have to define the bank account\n"
 #~ "in the journal definition for reconciliation."
@@ -6294,23 +6403,18 @@ msgstr "Calcular fechas del asiento"
 #~ "Debe definir la cuenta bancaria\n"
 #~ "en la definición del diario para conciliación"
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Error !"
 
-#, python-format
 #~ msgid "SAJ"
 #~ msgstr "VENTA"
 
-#, python-format
 #~ msgid "The journal must have centralised counterpart"
 #~ msgstr "El diario debe tener una contrapartida centralizada"
 
-#, python-format
 #~ msgid "Bad total !"
 #~ msgstr "Total erróneo !"
 
-#, python-format
 #~ msgid "End of Fiscal Year Entry"
 #~ msgstr "Asiento del fin de año fiscal"
 
@@ -6323,18 +6427,15 @@ msgstr "Calcular fechas del asiento"
 #~ msgid "Closing Balance"
 #~ msgstr "Balance de cierre"
 
-#, python-format
 #~ msgid "Free Reference"
 #~ msgstr "Referencia libre"
 
 #~ msgid "Move name"
 #~ msgstr "Nombre del movimiento"
 
-#, python-format
 #~ msgid "You can not deactivate an account that contains account moves."
 #~ msgstr "No puede desactivar una cuenta que contiene movimientos contables."
 
-#, python-format
 #~ msgid ""
 #~ "You can specify year, month and date in the name of the model using the "
 #~ "following labels:\n"
@@ -6354,7 +6455,6 @@ msgstr "Calcular fechas del asiento"
 #~ "\n"
 #~ "por ej. Mi modelo de %(date)s"
 
-#, python-format
 #~ msgid ""
 #~ "Tax base different !\n"
 #~ "Click on compute to update tax base"
@@ -6362,19 +6462,15 @@ msgstr "Calcular fechas del asiento"
 #~ "Base de impuesto diferente!\n"
 #~ "Haga click en Calcular para actualizar el impuesto base"
 
-#, python-format
 #~ msgid "Warning"
 #~ msgstr "Aviso"
 
-#, python-format
 #~ msgid "Please verify that an account is defined in the journal."
 #~ msgstr "POr favor verifique que se haya definido una cuenta en el diario."
 
-#, python-format
 #~ msgid "Entry is already reconciled"
 #~ msgstr "El asiento ya está conciliado"
 
-#, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
 #~ "Please create one."
@@ -6382,188 +6478,153 @@ msgstr "Calcular fechas del asiento"
 #~ "No hay un año fiscal definido para esta fecha!\n"
 #~ "Por favor, cree uno."
 
-#, python-format
 #~ msgid "This period is already closed !"
 #~ msgstr "Este periodo ya está cerrado!"
 
-#, python-format
 #~ msgid "Standard Encoding"
 #~ msgstr "Codificación estándar"
 
-#, python-format
 #~ msgid "Bad account!"
 #~ msgstr "Cuenta incorrecta !"
 
-#, python-format
 #~ msgid "Bad account !"
 #~ msgstr "Cuenta incorrecta !"
 
-#, python-format
 #~ msgid "No piece number !"
 #~ msgstr "No hay número de pieza !"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Error"
 
-#, python-format
 #~ msgid "Taxes missing !"
 #~ msgstr "Faltan los impuestos !"
 
-#, python-format
 #~ msgid "You have to define an analytic journal on the '%s' journal!"
 #~ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 
-#, python-format
 #~ msgid ""
 #~ "Can not create an automatic sequence for this piece !\n"
 #~ "\n"
-#~ "Put a sequence in the journal definition for automatic numbering or create a "
-#~ "sequence manually for this piece."
+#~ "Put a sequence in the journal definition for automatic numbering or "
+#~ "create a sequence manually for this piece."
 #~ msgstr ""
 #~ "¡No se puede crear una secuencia automática para este asiento!\n"
 #~ "\n"
-#~ "Ponga una secuencia en la definición de diario para la numeración automática "
-#~ "o cree una secuencia manualmente para este asiento."
+#~ "Ponga una secuencia en la definición de diario para la numeración "
+#~ "automática o cree una secuencia manualmente para este asiento."
 
 #~ msgid ""
-#~ "If you use payment terms, the due date will be computed automatically at the "
-#~ "generation of accounting entries. If you keep the payment term and the due "
-#~ "date empty, it means direct payment."
+#~ "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."
 #~ msgstr ""
 #~ "Si usa términos de pago, la fecha de vencimiento se calculará "
 #~ "automáticamente en la generación de asientos contables. Si deja vacíos el "
 #~ "término de pago y la fecha de vencimiento, significa pago directo."
 
-#, python-format
 #~ msgid "No Period found on Invoice!"
 #~ msgstr "No se encontro el período en la factura"
 
-#, python-format
 #~ msgid ""
 #~ "You can not modify a posted entry of this journal !\n"
 #~ "You should set the journal to allow cancelling entries if you want to do "
 #~ "that."
 #~ msgstr ""
 #~ "¡No se puede modificar un asiento publicado de este libro diario!\n"
-#~ "Debe configurar el libro diario para permitir la cancelación de los asientos "
-#~ "si quiere hacerlo."
+#~ "Debe configurar el libro diario para permitir la cancelación de los "
+#~ "asientos si quiere hacerlo."
 
-#, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
 #~ "No se ha definido un libro diario para el asiento de cierre para el "
 #~ "ejercicio fiscal"
 
-#, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "No se puede %s factura borrador/proforma/cancelada."
 
-#, python-format
 #~ msgid "No period found !"
 #~ msgstr "¡No se ha encontrado el período!"
 
-#, python-format
 #~ msgid "No Data Available"
 #~ msgstr "No hay datos disponibles"
 
-#, python-format
 #~ msgid "You must select accounts to reconcile"
 #~ msgstr "Debe seleccionar las cuentas a conciliar"
 
-#, python-format
 #~ msgid "You can not validate a non-balanced entry !"
 #~ msgstr "¡No se puede validar un asiento sin cuadrar!"
 
-#, python-format
 #~ msgid "Cannot create invoice move on centralised journal"
 #~ msgstr ""
 #~ "No se puede crear un asiento de factura en un libro diario centralizado"
 
-#, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
 
-#, python-format
 #~ msgid "Unable to find a valid period !"
 #~ msgstr "¡No ha sido posible encontrar un período válido!"
 
-#, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "La fecha debe contener valores entre %s y %s"
 
-#, python-format
 #~ msgid "Unable to change tax !"
 #~ msgstr "¡No ha sido posible cambiar el impuesto!"
 
-#, python-format
 #~ msgid ""
-#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
-#~ "defined !"
+#~ "The Payment Term of Supplier does not have Payment Term Lines"
+#~ "(Computation) defined !"
 #~ msgstr ""
 #~ "¡Los términos de pago de los proveedores no tienen líneas de términos de "
 #~ "pago (Cálculo) definidas!"
 
-#, python-format
 #~ msgid "No records found for your selection!"
 #~ msgstr "¡No se han encontrado registros para su selección!"
 
-#, python-format
 #~ msgid "Invoice is already reconciled"
 #~ msgstr "La factura ya está conciliada"
 
-#, python-format
 #~ msgid "You can not change the tax, you should remove and recreate lines !"
 #~ msgstr ""
-#~ "¡No se puede cambiar el impuesto, debe eliminar y volver a crear las líneas!"
+#~ "¡No se puede cambiar el impuesto, debe eliminar y volver a crear las "
+#~ "líneas!"
 
-#, python-format
 #~ msgid "Global taxes defined, but are not in invoice lines !"
 #~ msgstr ""
 #~ "¡Impuestos globales definidos, pero no están en líneas de la factura!"
 
-#, python-format
 #~ msgid "Data Insufficient !"
 #~ msgstr "¡Datos insuficientes!"
 
-#, python-format
 #~ msgid "The old fiscal year does not have any entry to reconcile!"
 #~ msgstr ""
 #~ "¡El ejercicio fiscal anterior no tiene ningún asiento para conciliar!"
 
-#, python-format
 #~ msgid "Can not pay draft/proforma/cancel invoice."
-#~ msgstr "No se puede pagar una factura en estado borrador/proforma/cancelada."
+#~ msgstr ""
+#~ "No se puede pagar una factura en estado borrador/proforma/cancelada."
 
-#, python-format
 #~ msgid "Closing of fiscal year cancelled, please check the box !"
 #~ msgstr "Cierre del año fiscal cancelado, por favor tilde la casilla !"
 
-#, python-format
 #~ msgid "Closing of states cancelled, please check the box !"
 #~ msgstr "Cierre de estados cancelado, por favor tilde la casilla !"
 
-#, python-format
 #~ msgid ""
-#~ "Specified Journal does not have any account move entries in draft state for "
-#~ "this period"
+#~ "Specified Journal does not have any account move entries in draft state "
+#~ "for this period"
 #~ msgstr ""
-#~ "El diario indicado no tiene movimientos contables en estado de borrador para "
-#~ "este período"
+#~ "El diario indicado no tiene movimientos contables en estado de borrador "
+#~ "para este período"
 
-#, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "Línea de asiento contable \"%s\" no es válida"
 
-#, python-format
 #~ msgid "You must define an analytic journal of type '%s' !"
 #~ msgstr "¡Debe definir un libro diario analítico de tipo '%s'!"
 
-#, python-format
 #~ msgid "You must enter a period length that cannot be 0 or below !"
 #~ msgstr ""
 #~ "¡Debe introducir una duración del período que no puede ser 0 o inferior!"
 
-#, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "La fecha no está en un ejercicio fiscal definido"
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index c99f2249ff4..015b3382131 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Võrdlemata kirjed"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Baaskood"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Jääk"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -187,10 +185,8 @@ msgid "Move line select"
 msgstr "Liiguta valitud rida"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Kirje silt"
 
@@ -205,14 +201,12 @@ msgid "Period Sum"
 msgstr "Perioodi summa"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Arvuta kood (kui tüüp=kood)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Raamatupidamiskande rida"
 
@@ -229,12 +223,9 @@ msgstr "Perioodilised kirjed"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Kogus"
@@ -271,8 +262,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -281,14 +271,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fikseeritud"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Tasumata Maksed"
 
@@ -304,8 +292,7 @@ msgid "Select period"
 msgstr "Vali periood"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Päritolu"
 
@@ -335,8 +322,7 @@ msgid "Delta Debit"
 msgstr "Delta deebet"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Maksud"
@@ -355,14 +341,12 @@ msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Maks alamliikidele"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Päeviku nimi"
@@ -430,11 +414,8 @@ msgid "Contra"
 msgstr "Vastu"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Olek"
@@ -446,8 +427,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Maksmata tarnija hüvitised"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Eriline arvutamine"
 
@@ -469,10 +449,8 @@ msgid "Disc.(%)"
 msgstr "Allah. (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Viide"
@@ -663,8 +641,7 @@ msgid "Sub-Total :"
 msgstr "Vahesumma:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -696,8 +673,7 @@ msgid "Select the Period for Analysis"
 msgstr "Vali periood analüüsi jaoks"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -729,8 +705,7 @@ msgid "Field Name"
 msgstr "Välja nimi"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Logi vanemana"
 
@@ -740,8 +715,7 @@ msgid "End of Year Entries Journal"
 msgstr "Aastalõpu kirjete päevik"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Ostu omadused"
 
@@ -761,12 +735,9 @@ msgid "Move Lines Created."
 msgstr "Liiguta loodud read."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Olek"
 
@@ -919,10 +890,8 @@ msgstr "Vali kontoplaan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kogus"
@@ -965,16 +934,13 @@ msgstr "Analüütiline arve"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -996,8 +962,7 @@ msgid "Net Total:"
 msgstr "Netosumma:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1119,8 +1084,7 @@ msgid "Fiscal Position Templates"
 msgstr "Finantspositsioonide mallid"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ühiku hind"
 
@@ -1273,8 +1237,7 @@ msgid "Not reconciled transactions"
 msgstr "Võrdlemata tehingud"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1296,8 +1259,7 @@ msgid "Write-Off account"
 msgstr "Mahakandmiste konto"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Mudel"
 
@@ -1323,11 +1285,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Vaade"
 
@@ -1396,8 +1356,7 @@ msgstr "Konto tüübid"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1413,8 +1372,7 @@ msgid "Journal"
 msgstr "Päevik"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Alamkontod"
 
@@ -1440,8 +1398,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Hoia tühjana, et kasutada tulude kontot"
 
@@ -1568,8 +1525,7 @@ msgid "Account n°"
 msgstr "Konto nr."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Jäta tühjaks kasutamaks kulu kontot"
 
@@ -1579,8 +1535,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Partneri viide"
@@ -1592,14 +1547,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Nõuete ja võlgade kontod"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Tellimuse read"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1763,8 +1716,7 @@ msgid "Period length (days)"
 msgstr "Perioodi pikkus (päeva)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Protsent"
@@ -1775,8 +1727,7 @@ msgid "Charts"
 msgstr "Plaanid"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1850,12 +1801,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tüüp"
 
@@ -2003,8 +1951,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2019,8 +1966,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2093,10 +2039,8 @@ msgstr "Endine"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuuta"
@@ -2134,8 +2078,7 @@ msgid "Analytic Entry"
 msgstr "Analüütiline kirje"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2187,8 +2130,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolideerimine"
 
@@ -2251,13 +2193,9 @@ msgid "Date Invoiced"
 msgstr "Arveldamise kuupäev"
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Kõik perioodid kui tühi"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2280,21 +2218,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Kuupäev"
@@ -2311,8 +2244,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Maksutüüp"
 
@@ -2322,8 +2254,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Kasutaja"
 
@@ -2409,8 +2340,7 @@ msgid "Date End"
 msgstr "Lõppkuupäev"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2418,8 +2348,7 @@ msgid "Entry Lines"
 msgstr "Kirje read"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2508,11 +2437,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2531,8 +2458,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -2542,10 +2468,8 @@ msgid "Acc. Type Name"
 msgstr "Konto tüübi nimi"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2559,8 +2483,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Info"
@@ -2670,8 +2593,7 @@ msgid "Price"
 msgstr "Hind"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2738,17 +2660,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2788,8 +2706,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2882,16 +2799,11 @@ msgid "Full Account Name"
 msgstr "Täielik konto nimi"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2912,9 +2824,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Raamatupidamine"
 
@@ -2959,10 +2869,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Maksukood"
@@ -3002,14 +2910,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3047,8 +2953,7 @@ msgid "Cancel selected invoices"
 msgstr "Tühista valitud arved"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3071,28 +2976,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Võlad"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Baas"
 
@@ -3102,8 +3002,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Muud"
 
@@ -3113,15 +3012,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Valideeri"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3136,17 +3033,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3167,12 +3061,9 @@ msgid "By Date and Period"
 msgstr "Kuupäeva ja perioodi järgi"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Märkused"
@@ -3185,8 +3076,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3211,21 +3101,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kood"
 
@@ -3235,8 +3119,7 @@ msgid "Financial Management"
 msgstr "Finantshaldus"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3263,8 +3146,7 @@ msgid "Additionnal Information"
 msgstr "Lisainfo"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Maksu Nimi"
@@ -3341,8 +3223,7 @@ msgid "Partner Balance"
 msgstr "Partneri bilanss"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3355,8 +3236,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3393,8 +3273,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3410,8 +3289,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Otsetee"
 
@@ -3436,15 +3314,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Ülem maksukonto"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3480,8 +3356,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3557,8 +3432,7 @@ msgid "Journal code"
 msgstr "Päeviku kood"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Loo sissekanded"
 
@@ -3614,14 +3488,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Järjekord"
@@ -3687,8 +3558,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Tähtaja kuupäev"
 
@@ -3708,8 +3578,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Alguskuupäev"
@@ -3747,8 +3616,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3772,8 +3640,7 @@ msgid "Entry Sequence"
 msgstr "Kirje järjekord"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Suletud"
 
@@ -3894,12 +3761,9 @@ msgid "Code/Date"
 msgstr "Kood/Kuupäev"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiivne"
@@ -3951,20 +3815,15 @@ msgid "Secondary Currency"
 msgstr "Teine Valuuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3995,8 +3854,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4088,18 +3946,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4112,8 +3967,7 @@ msgid "Periods"
 msgstr "Perioodid"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4140,8 +3994,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Vaikimisi Maksud"
 
@@ -4195,8 +4048,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Konto nimi"
 
@@ -4287,8 +4139,7 @@ msgid "Import file from your bank statement"
 msgstr "Impordi fail oma pangabilansist"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Sisemine tüüp"
 
@@ -4314,14 +4165,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Krediidi Märkused"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
@@ -4342,8 +4191,7 @@ msgid "Day of the Month"
 msgstr "Päev kuus"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Read"
 
@@ -4361,8 +4209,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Maksudeklaratsioon"
 
@@ -4422,14 +4269,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Olekud"
 
@@ -4465,8 +4310,7 @@ msgstr "Alguskuupäev"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Kokku"
 
@@ -4583,11 +4427,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4682,12 +4524,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4764,8 +4603,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Nõuded"
@@ -4792,8 +4630,7 @@ msgstr "KM:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Kokku:"
@@ -4804,8 +4641,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4821,8 +4657,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Kinnita"
 
@@ -4837,8 +4672,7 @@ msgid "Parent Account Template"
 msgstr "Ülemkonto mall"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4856,8 +4690,7 @@ msgid "Analytic account"
 msgstr "Analüütiline konto"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tarnija arve"
 
@@ -4867,22 +4700,16 @@ msgid "Valid"
 msgstr "Kehtiv"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Deebet"
@@ -4944,8 +4771,7 @@ msgid "Reporting"
 msgstr "Aruandlus"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4976,8 +4802,7 @@ msgid "Configuration"
 msgstr "Seadistus"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Kogusumma"
 
@@ -5027,14 +4852,12 @@ msgid "Paid invoice"
 msgstr "Makstud arve"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Maksu definitsioon"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Maksu Grupp"
 
@@ -5075,8 +4898,7 @@ msgid "With movements"
 msgstr "Liikumistega"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domeen"
 
@@ -5101,9 +4923,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5120,8 +4940,7 @@ msgid "Payable Accounts"
 msgstr "Võlgade kontod"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Arve rida"
 
@@ -5172,8 +4991,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Maksed"
@@ -5219,12 +5037,9 @@ msgstr "Vali päevik ja makse kuupäev"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Mustand"
@@ -5251,8 +5066,7 @@ msgid "Are you sure ?"
 msgstr "Oled sa kindel?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5288,22 +5102,16 @@ msgid "Supplier Invoice Process"
 msgstr "Tarnija arve protsess"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Valikuline info"
 
@@ -5319,8 +5127,7 @@ msgid "Receivable and Payable"
 msgstr "Nõuded ja võlad"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5343,8 +5150,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Arvuta"
@@ -5388,8 +5194,7 @@ msgid "End of period"
 msgstr "Perioodi lõpp"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Konto kirje"
 
@@ -5400,8 +5205,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5409,12 +5213,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Bilanss"
@@ -5458,11 +5259,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Üldine info"
 
@@ -5501,8 +5299,7 @@ msgid "List of Accounts"
 msgstr "Kontode nimekiri"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5595,15 +5392,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -5647,8 +5440,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5730,8 +5522,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Kassa"
 
@@ -5771,8 +5562,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jäta tühjaks kõigi avatud majandusaastate joks"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Tarnija tagasimakse"
 
@@ -5820,10 +5610,8 @@ msgstr ""
 "Seda kontot kasutatakse käesoleva kategooria lao väljundväärtuse hindamiseks"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5857,10 +5645,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Majandusaasta nimi nagu kuvatakse ekraanil."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5918,11 +5704,340 @@ msgstr "Jah"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Arvuta kirje kuupäevad"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Analüütilised kontod sulgeda"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Arvete mustandid"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Raamatupdamise töölaud"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Kulud arveldamiseks"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Töölaud raamatupidajale"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Tulude kontod"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Minu näiturid"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Raamatupidamise töölaud"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Aegunud tulu"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Näita Deebet/Kreedit informatsiooni"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Kõik kontod"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Kirjete valik põhineb"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Teavitus"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Finantsperiood"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Kontojääk"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Vali periood(id)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Protsent"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Vali finantsaasta(d) (maksimum kolm aastat)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Valige võrdluskonto (% võrdluseks)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Konto bilanss - võrdle aastaid"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Näita võrdlus protsentides %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Vali periood"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Aruande valikud"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Ära Võrdle"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Näita Kontosid"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Sa võid valida maksimaalselt  3 aastat. Palun märgista uuesti."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Võimalik, et Teie tegite järgmised vead. Palun parandage need ja proovige "
+"uuesti."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Loomise Kuupäev"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Te peate valima vähemalt ühe finantsaasta. Proovige uuesti."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Kohanda aruannet"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Kuu vahemik"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Viimase 15 päeva jooksul loodud arved"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Viimase 15 päeva jooksul loodud arvete aruanne"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Täiskogus"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Kontod tüübi järgi"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Aegunud nõuded kuni tänaseni"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Laekumiskontod"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Vahemik"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Moodul, mis lisab uusi aruandeid konto mooduli põhjal."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Konto aruandlus - Aruandlus"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Bilanss kontotüübi järgi"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Nädal"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Loomise kuupäev"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Aegunud nõuded"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Maksuvaba summa"
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 1ac3d78f708..b30a3aa19a0 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -93,8 +93,7 @@ msgid "Unreconciled entries"
 msgstr "Suorittamattomat merkinnät"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Peruskoodi"
@@ -126,8 +125,7 @@ msgid "Residual"
 msgstr "Jäännös"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -191,10 +189,8 @@ msgid "Move line select"
 msgstr "Siirrä rivivalinta"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Merkintänimike"
 
@@ -209,14 +205,12 @@ msgid "Period Sum"
 msgstr "Kauden summa"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Suorita koodi (jos tyyppi=koodi)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Tilimerkinnän rivi"
 
@@ -233,12 +227,9 @@ msgstr "Toistuvat tapahtumat"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Summa"
@@ -279,8 +270,7 @@ msgstr ""
 "päiväkirjaan oman näkymän jotta merkintöjen kirjaaminen olisi nopeampaa."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -293,14 +283,12 @@ msgstr ""
 "useampi eräpäivä, esimerkiksi 50% nyt ja 50% kuukauden kuluttua."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Kiinteä"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Erääntyneet maksut"
 
@@ -316,8 +304,7 @@ msgid "Select period"
 msgstr "Valitse jakso"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Lähde"
 
@@ -347,8 +334,7 @@ msgid "Delta Debit"
 msgstr "Debetin muutos"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Vero"
@@ -367,14 +353,12 @@ msgid "Analytic Account"
 msgstr "Analyyttinen tili"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Vero alemmille"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Päiväkirjan nimi"
@@ -442,11 +426,8 @@ msgid "Contra"
 msgstr "Kontra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Tila"
@@ -458,8 +439,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Maksamattomat toimittajan korvaukset"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Erikoislaskenta"
 
@@ -481,10 +461,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Viite"
@@ -682,8 +660,7 @@ msgid "Sub-Total :"
 msgstr "Välisumma:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -715,8 +692,7 @@ msgid "Select the Period for Analysis"
 msgstr "Valitse analysointijakso"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -748,8 +724,7 @@ msgid "Field Name"
 msgstr "Kentän nimi"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Etumerkki ylemmälle"
 
@@ -759,8 +734,7 @@ msgid "End of Year Entries Journal"
 msgstr "Päätösmerkintöjen päiväkirja"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Ostojen ominaisuudet"
 
@@ -780,12 +754,9 @@ msgid "Move Lines Created."
 msgstr "Siirtorivit luotu"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Tila"
 
@@ -942,10 +913,8 @@ msgstr "Valitse tilikartta"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Määrä"
@@ -988,16 +957,13 @@ msgstr "Analyyttinen lasku"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1019,8 +985,7 @@ msgid "Net Total:"
 msgstr "Netto:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1144,8 +1109,7 @@ msgid "Fiscal Position Templates"
 msgstr "Talouskantojen mallit"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Yksikköhinta"
 
@@ -1303,8 +1267,7 @@ msgid "Not reconciled transactions"
 msgstr "Suorittamattomat tapahtumat"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Verokartoitus"
@@ -1326,8 +1289,7 @@ msgid "Write-Off account"
 msgstr "Arvonalennustili"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Malli"
 
@@ -1353,11 +1315,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Valitse maksettavat laskut sekä hallinnoi ennakkomaksuja"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Näkymä"
 
@@ -1428,8 +1388,7 @@ msgstr "Tilityypit"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1445,8 +1404,7 @@ msgid "Journal"
 msgstr "Päiväkirja"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Alemmat tilit"
 
@@ -1472,8 +1430,7 @@ msgid "Statement reconcile line"
 msgstr "Tiliotteen suoritusrivi"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
 
@@ -1602,8 +1559,7 @@ msgid "Account n°"
 msgstr "Tilinro."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Jätä tyhjäksi jos haluat käyttää kulutiliä"
 
@@ -1613,8 +1569,7 @@ msgid "Account to reconcile"
 msgstr "Tili suorituksille"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Kumppanin viite"
@@ -1626,14 +1581,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Saatavat ja maksettavat tilit"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Ennakkomaksurivit"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1797,8 +1750,7 @@ msgid "Period length (days)"
 msgstr "Jakson pituus (päiviä)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Prosentti"
@@ -1809,8 +1761,7 @@ msgid "Charts"
 msgstr "Tilikartat"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1884,12 +1835,9 @@ msgstr "x Hyvityslaskujen kulupäiväkirja"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -2037,8 +1985,7 @@ msgid "Journal-Period Name"
 msgstr "Päiväkirjan jakson nimi"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Verotapauksen nimi"
 
@@ -2055,8 +2002,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2129,10 +2075,8 @@ msgstr "Mennyt"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuutta"
@@ -2170,8 +2114,7 @@ msgid "Analytic Entry"
 msgstr "Analyyttinen merkintä"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Myöhässä olevien maksujen viesti"
 
@@ -2223,8 +2166,7 @@ msgid "Detail"
 msgstr "Yksityiskohdat"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Yhdistetty"
 
@@ -2318,21 +2260,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Verotuksen tilipohja."
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Päiväys"
@@ -2349,8 +2286,7 @@ msgid "Unreconcile"
 msgstr "Poista suoritukset"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Verotyyppi"
 
@@ -2360,8 +2296,7 @@ msgid "Statement Entries"
 msgstr "Tiliotteen kohdat"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -2449,8 +2384,7 @@ msgid "Date End"
 msgstr "Loppupäiväys"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2458,8 +2392,7 @@ msgid "Entry Lines"
 msgstr "Merkitärivit"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Soveltuva koodi (jos tyyppi=koodi)"
 
@@ -2548,11 +2481,9 @@ msgstr "Analyyttisistä tileistä, luo lasku"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2571,8 +2502,7 @@ msgstr "Analyyttisistä tileistä, luo lasku"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -2582,10 +2512,8 @@ msgid "Acc. Type Name"
 msgstr "Tilityypin nimi"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2599,8 +2527,7 @@ msgid "Litigation"
 msgstr "Oikeudenkäynti"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Tieto"
@@ -2686,9 +2613,9 @@ msgid ""
 msgstr ""
 "Tyyppiä käytetään erottamaan tilejä joilla on OpenERP:ssä erityisiä "
 "ominaisuuksia: \"näkymä\" ei voi sisältää merkintöjä, \"yhdistetty\" tili "
-"muodostuu useammasta alatilistä (esim. useammasta yrityksestä), "
-"\"maksettavat\" / \"saatavat\" ovat kumppanien tilejä (käytetään velka-"
-"/luottolaskelmiin) ja \"suljettu\" tili on poistettu käytöstä."
+"muodostuu useammasta alatilistä (esim. useammasta yrityksestä), \"maksettavat"
+"\" / \"saatavat\" ovat kumppanien tilejä (käytetään velka-/luottolaskelmiin) "
+"ja \"suljettu\" tili on poistettu käytöstä."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2716,8 +2643,7 @@ msgid "Price"
 msgstr "Hinta"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2784,17 +2710,13 @@ msgid "Invoice Reference"
 msgstr "Laskuviite"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nimi"
@@ -2837,8 +2759,7 @@ msgstr ""
 "tapauksessa hankkimisen arviointi on tärkeää."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2931,16 +2852,11 @@ msgid "Full Account Name"
 msgstr "Tilin kokonimi"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2961,9 +2877,7 @@ msgid "Document: Customer account statement"
 msgstr "Dokumentti: Asiakkaan tiliote"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Kirjanpito"
 
@@ -3008,10 +2922,8 @@ msgid "Centralisation"
 msgstr "Keskitys"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Verokoodi"
@@ -3054,14 +2966,12 @@ msgstr ""
 "kumppanin maksuehdon mukainen aika."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Tilanne"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokumentti"
 
@@ -3101,8 +3011,7 @@ msgid "Cancel selected invoices"
 msgstr "Peruuta valitut laskut"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3125,28 +3034,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Aseta luonnokseksi"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Dokumentin viite joka on luonut tämän laskun."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Maksettavat"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Perus"
 
@@ -3156,8 +3060,7 @@ msgid "Model Name"
 msgstr "Mallin nimi"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Toiset"
 
@@ -3167,15 +3070,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Vahvista"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Selitys"
 
@@ -3190,17 +3091,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3221,12 +3119,9 @@ msgid "By Date and Period"
 msgstr "Päiväyksen ja jakson mukaan"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Muistiinpanot"
@@ -3241,8 +3136,7 @@ msgstr ""
 "tilisiirtomerkinnöillä."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3267,21 +3161,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Tiliotteen syöttäminen tuottaa maksumerkinnät"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Koodi"
 
@@ -3291,8 +3179,7 @@ msgid "Financial Management"
 msgstr "Taloudenhallinta"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Ei mikään"
@@ -3319,8 +3206,7 @@ msgid "Additionnal Information"
 msgstr "Lisätiedot"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Veronimi"
@@ -3397,8 +3283,7 @@ msgid "Partner Balance"
 msgstr "Kumppanin saldo"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Kolmannen osapuolen tilikirja"
 
@@ -3411,8 +3296,7 @@ msgstr "Tätä tiliä käytetään oletustilin sijasta tämän kumppanin saatavi
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3451,8 +3335,7 @@ msgid "Import invoice"
 msgstr "Tuo lasku"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Luo"
@@ -3468,8 +3351,7 @@ msgid "Invoice line"
 msgstr "Laskurivi"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Oikotie"
 
@@ -3498,15 +3380,13 @@ msgstr ""
 "monivaluuttainen merkintä."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Ylin verotili"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3542,8 +3422,7 @@ msgid "Central Journal"
 msgstr "Keskitetty päiväkirja"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldoa tuotu eteenpäin"
 
@@ -3619,8 +3498,7 @@ msgid "Journal code"
 msgstr "Päiväkirjakoodi"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Luo tapahtumat"
 
@@ -3676,14 +3554,11 @@ msgid ""
 msgstr "Valitse tämä jos et halua ALV:tä liitettävän verokoodeihin laskuilla"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sarja"
@@ -3751,8 +3626,7 @@ msgstr "Tilin ennakkomaksu"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Eräpäivä"
 
@@ -3772,8 +3646,7 @@ msgid "Account Configure Wizard "
 msgstr "Tilin ohjattu konfigurointi toiminto "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Aloituspäivämäärä"
@@ -3811,8 +3684,7 @@ msgid "Unreconciled"
 msgstr "Suorittamaton"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Huomautus"
 
@@ -3845,8 +3717,7 @@ msgid "Entry Sequence"
 msgstr "Merkinnän sarja"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Suljettu"
 
@@ -3974,12 +3845,9 @@ msgid "Code/Date"
 msgstr "Koodi/Päivämäärä"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiivinen"
@@ -4031,20 +3899,15 @@ msgid "Secondary Currency"
 msgstr "Toissijainen valuutta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4076,8 +3939,7 @@ msgid "Account Move"
 msgstr "Tilisiirto"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Tilioterivit"
 
@@ -4173,18 +4035,15 @@ msgid "Journal Column"
 msgstr "Päiväkirjan sarake"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4197,8 +4056,7 @@ msgid "Periods"
 msgstr "Jaksot"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4222,12 +4080,10 @@ msgstr "Etsintäkohteet"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
-"Analyyttiset kustannukset uudelleenlaskuttaa ostoja, tuntilistoja jne."
+msgstr "Analyyttiset kustannukset uudelleenlaskuttaa ostoja, tuntilistoja jne."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Oletusverot"
 
@@ -4284,8 +4140,7 @@ msgstr "Tyyppihallinnat"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Tilin nimi"
 
@@ -4376,8 +4231,7 @@ msgid "Import file from your bank statement"
 msgstr "Tuo tiedosto pankin tiliotteesta"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Sisäinen tyyppi"
 
@@ -4403,14 +4257,12 @@ msgid "Posted"
 msgstr "Postitettu"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Luottotiedot"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Lopetuspäivämäärä"
 
@@ -4431,8 +4283,7 @@ msgid "Day of the Month"
 msgstr "Kuukaudenpäivä"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Rivit"
 
@@ -4453,8 +4304,7 @@ msgstr ""
 "Tässä tapauksessa arviointia on tärkeää."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Veron kuvaus"
 
@@ -4514,14 +4364,12 @@ msgid "The optional quantity on entries"
 msgstr "Valinnainen merkintöjen määrä"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Tilat"
 
@@ -4557,8 +4405,7 @@ msgstr "Aloituspäivämäärä"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Yhteensä"
 
@@ -4677,11 +4524,9 @@ msgstr "Hyväksytyt merkinnät laskulta"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4778,12 +4623,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Tulosta välitase"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Viite"
 
@@ -4863,8 +4705,7 @@ msgid "Control Invoice"
 msgstr "Ohjaa laskua"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Saatavat"
@@ -4891,8 +4732,7 @@ msgstr "ALV:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Yhteensä:"
@@ -4903,8 +4743,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Tilikartoitus"
@@ -4920,8 +4759,7 @@ msgid "Account Reconciliation"
 msgstr "Tilien suoritusmerkinnät"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -4936,8 +4774,7 @@ msgid "Parent Account Template"
 msgstr "Ylätilin malli"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4957,8 +4794,7 @@ msgid "Analytic account"
 msgstr "Analyyttinen kirjanpito"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Toimittajan lasku"
 
@@ -4968,22 +4804,16 @@ msgid "Valid"
 msgstr "Voimassa"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debet"
@@ -5045,8 +4875,7 @@ msgid "Reporting"
 msgstr "Raportointi"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5077,8 +4906,7 @@ msgid "Configuration"
 msgstr "Konfiguraatio"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Yhteensä"
 
@@ -5128,14 +4956,12 @@ msgid "Paid invoice"
 msgstr "Maksettu lasku"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Veron määritys"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Veroryhmä"
 
@@ -5178,8 +5004,7 @@ msgid "With movements"
 msgstr "Siirtojen kanssa"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Toimialue"
 
@@ -5204,9 +5029,7 @@ msgid "Manually"
 msgstr "Manuaalisesti"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5223,8 +5046,7 @@ msgid "Payable Accounts"
 msgstr "Maksettavat tilit"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Laskun rivi"
 
@@ -5275,8 +5097,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Valinnainen toinen valuutta jos merkintä on monivaluuttainen."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Maksut"
@@ -5322,12 +5143,9 @@ msgstr "Valitse päiväkirja ja maksupäivä"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Luonnos"
@@ -5354,8 +5172,7 @@ msgid "Are you sure ?"
 msgstr "Oletko varma?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Proforma"
 
@@ -5391,22 +5208,16 @@ msgid "Supplier Invoice Process"
 msgstr "Toimittajan laskutusprosessi"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Sivu"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Lisätiedot"
 
@@ -5422,8 +5233,7 @@ msgid "Receivable and Payable"
 msgstr "Saatavat ja maksettavat"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5449,8 +5259,7 @@ msgstr ""
 "veroa)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Laske"
@@ -5494,8 +5303,7 @@ msgid "End of period"
 msgstr "Jakson loppu"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Tilimerkintä"
 
@@ -5506,8 +5314,7 @@ msgid "General Journal"
 msgstr "Yleinen päiväkirja"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5515,12 +5322,9 @@ msgstr "Yleinen päiväkirja"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5566,11 +5370,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Sarja jota käytetään laskujen numeroihin tässä päiväkirjassa."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Yleistiedot"
 
@@ -5611,8 +5412,7 @@ msgid "List of Accounts"
 msgstr "Tililistaus"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Myynnin ominaisuudet"
 
@@ -5705,15 +5505,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -5760,8 +5556,7 @@ msgstr ""
 "Tätä tiliä käytetään oletustilin sijasta tämän kumppanin maksettaville."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Asiakoodi"
 
@@ -5843,8 +5638,7 @@ msgstr "Mallien määritelmät"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Käteinen"
 
@@ -5884,8 +5678,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Toimittajan hyvitys"
 
@@ -5932,10 +5725,8 @@ msgid ""
 msgstr "Tili lähtevän tavaran arvolle tuoteluokittain"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5969,10 +5760,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Tilikauden nimi siten kun se näytetään ruudulla."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6029,8 +5818,7 @@ msgstr "Kyllä"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Valitse tämä jos käyttäjän on sallittua tehdä suoritusmerkintöjä tässä "
 "tilissä."
@@ -6040,90 +5828,275 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Laske merkintäpäivät"
 
-#, python-format
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Kaikki tilit"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Tili balanssi"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Valitse kausi"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Älä vertaa"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Näytä tilit"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Olet valinnut enemmän kuin 3 vuotta joka tapauksessa"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Luomispäivämäärä"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
 #~ msgid "No period found !"
 #~ msgstr "Ajanjaksoa ei löydy!"
 
 #~ msgid "Error! You can not create recursive account."
 #~ msgstr "Virhe! Et voi luoda rekursiivista tiliä"
 
-#, python-format
 #~ msgid "You must first select a partner !"
 #~ msgstr "Sinun täytyy ensiksi valita yhteistyökumppani!"
 
-#, python-format
 #~ msgid "No Data Available"
 #~ msgstr "Ei tietoa saatavilla"
 
 #~ msgid "Crédit"
 #~ msgstr "Luotto"
 
-#, python-format
 #~ msgid "No Partner Defined !"
 #~ msgstr "Ei kumppania määriteltynä!"
 
-#, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "Laskua(laskuja) jotka ovat avatuja tai maksettuja ei voida poistaa"
 
-#, python-format
 #~ msgid "Unable to find a valid period !"
 #~ msgstr "Voimassa olevaa jaksoa ei löydy"
 
 #~ msgid "Débit"
 #~ msgstr "Debet"
 
-#, python-format
 #~ msgid "Configration Error !"
 #~ msgstr "Asetusvirhe"
 
-#, python-format
 #~ msgid "Unable to change tax !"
 #~ msgstr "Veroa ei voida muuttaa!"
 
-#, python-format
 #~ msgid "No records found for your selection!"
 #~ msgstr "Tietoja ei löydy valinnalle"
 
 #~ msgid "Move name"
 #~ msgstr "Siirrä nimi"
 
-#, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Päiväys täytyy asettaa välille %s ja %s"
 
-#, python-format
 #~ msgid "Entries: "
 #~ msgstr "Merkinnät: "
 
-#, python-format
 #~ msgid "Couldn't create move between different companies"
 #~ msgstr "Ei voida luoda siirtoa eri yritysten välille"
 
-#, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Eheysvirhe!"
 
 #~ msgid "Disc. (%)"
 #~ msgstr "Alen. (%)"
 
-#, python-format
 #~ msgid "Free Reference"
 #~ msgstr "Avoin viite"
 
-#, python-format
 #~ msgid "You must enter a period length that cannot be 0 or below !"
 #~ msgstr "Ajanjakson lukumäärä tulee olla suurempi kuin 0"
 
-#, python-format
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Ei voi %s vedos/proforma/peruuttaa laskua"
 
-#, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "Oletettu saldo (%.2f) on erisuuri kuin laskettu. (%2f)"
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Virheellinen toiminto!"
+
+#~ msgid "Account Information"
+#~ msgstr "Tilitiedot"
+
+#~ msgid "Printing date:"
+#~ msgstr "Tulostus päiväys:"
+
+#~ msgid "Currency:"
+#~ msgstr "Valuutta"
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 6e6d5987292..37a97c4d99a 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -75,8 +75,7 @@ msgid "Entries by Statements"
 msgstr "Écritures par état"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -297,8 +296,7 @@ msgstr ""
 "mettre la date limite pour le règlement de cette ligne d'écriture."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Déclaration de taxe"
 
@@ -389,8 +387,7 @@ msgid "Fiscal Year to close"
 msgstr "Exercice fiscal à clôturer"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Code de la case"
 
@@ -537,8 +534,7 @@ msgid "Reconciliation result"
 msgstr "Résultat du lettrage"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Compte de base"
@@ -570,8 +566,7 @@ msgid "Residual"
 msgstr "Solde dû"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -629,10 +624,8 @@ msgid "Move line select"
 msgstr "Déplacer la ligne sélectionnée"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Libellé de l'écriture"
 
@@ -647,26 +640,21 @@ msgid "Period Sum"
 msgstr "Montant total de la période"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Mode de Calcul (si type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Écritures comptables"
 
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Montant"
@@ -707,8 +695,7 @@ msgstr ""
 "saisie dans les journaux."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -722,14 +709,12 @@ msgstr ""
 "d'échéance, par example, 50% maintenant, 50% dans un mois."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fixe"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Retard de règlement"
 
@@ -745,8 +730,7 @@ msgid "Select period"
 msgstr "Sélectionnez une période"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origine"
 
@@ -776,8 +760,7 @@ msgid "Delta Debit"
 msgstr "Delta de débit"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Impôts et taxes"
@@ -796,14 +779,12 @@ msgid "Analytic Account"
 msgstr "Centre de coûts"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Taxe sur les objets fils"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nom du journal"
@@ -872,11 +853,8 @@ msgid "Contra"
 msgstr "Contrat"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "État"
@@ -888,8 +866,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Avoirs fournisseurs en attente de déduction"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Calcul particulier"
 
@@ -913,10 +890,8 @@ msgid "Disc.(%)"
 msgstr "Rem.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Réf."
@@ -1104,8 +1079,7 @@ msgid "Sub-Total :"
 msgstr "Sous-Total :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -1137,8 +1111,7 @@ msgid "Select the Period for Analysis"
 msgstr "Sélectionnez la période à analyser"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -1170,8 +1143,7 @@ msgid "Field Name"
 msgstr "Nom du champ"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Signe pour le parent"
 
@@ -1181,8 +1153,7 @@ msgid "End of Year Entries Journal"
 msgstr "Journal des opérations de fin d'année"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propriétés de l'Achat"
 
@@ -1202,12 +1173,9 @@ msgid "Move Lines Created."
 msgstr "Lignes de mouvement créées"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "État"
 
@@ -1344,10 +1312,8 @@ msgstr "Sélectionner un plan de compte"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantité"
@@ -1384,16 +1350,13 @@ msgstr "Facturation analytique"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1509,8 +1472,7 @@ msgid "Income Category Account"
 msgstr "Catégorie de compte produits"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Prix unitaire"
 
@@ -1648,8 +1610,7 @@ msgid "Not reconciled transactions"
 msgstr "Transaction non-lettrée"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Affectation des taxes"
@@ -1671,8 +1632,7 @@ msgid "Write-Off account"
 msgstr "Compte de pertes et profits"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modèle"
 
@@ -1698,11 +1658,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Sélectionnez les factures que vous souhaitez régler"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Vue"
 
@@ -1773,8 +1731,7 @@ msgstr "Types de compte"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1790,8 +1747,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Comptes fils"
 
@@ -1817,8 +1773,7 @@ msgid "Statement reconcile line"
 msgstr "Ligne d'extrait lettré"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Laisser vide pour utiliser le compte de revenu"
 
@@ -1942,8 +1897,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Laisser vide pour utiliser le compte de dépense"
 
@@ -1953,8 +1907,7 @@ msgid "Account to reconcile"
 msgstr "Comptes à lettrer"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Réf. partenaire"
@@ -1966,14 +1919,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Comptes débiteurs & créditeurs"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Écritures d'abonnement"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -2126,8 +2077,7 @@ msgid "Period length (days)"
 msgstr "Durée d'une période (jours)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Pourcent"
@@ -2138,8 +2088,7 @@ msgid "Charts"
 msgstr "Plan comptable"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -2206,12 +2155,9 @@ msgstr "Journal des Dépenses de Notes de Crédits"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Type"
 
@@ -2359,8 +2305,7 @@ msgid "Journal-Period Name"
 msgstr "Nom de la période du journal"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nom de la case de taxe"
 
@@ -2378,8 +2323,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2454,10 +2398,8 @@ msgstr "Passée"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Devises"
@@ -2495,8 +2437,7 @@ msgid "Analytic Entry"
 msgstr "Ecriture analytique"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Message pour les paiements en retard"
 
@@ -2543,8 +2484,7 @@ msgid "Detail"
 msgstr "Détail"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidation"
 
@@ -2641,21 +2581,16 @@ msgid "The account basis of the tax declaration."
 msgstr "La base de compte de la déclaration fiscale."
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Date"
@@ -2666,14 +2601,12 @@ msgid "Reference Type"
 msgstr "Type de référence"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Type de Taxe"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
@@ -2763,8 +2696,7 @@ msgid "Date End"
 msgstr "Date de fin"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2772,8 +2704,7 @@ msgid "Entry Lines"
 msgstr "Lignes d'écriture"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Code applicable (si type=code)"
 
@@ -2856,11 +2787,9 @@ msgstr "Depuis un compte analytique, créer une facture"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2879,8 +2808,7 @@ msgstr "Depuis un compte analytique, créer une facture"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2890,10 +2818,8 @@ msgid "Acc. Type Name"
 msgstr "Intitulé"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2907,8 +2833,7 @@ msgid "Litigation"
 msgstr "Litige"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Information"
@@ -3026,8 +2951,7 @@ msgid "Price"
 msgstr "Prix"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -3094,17 +3018,13 @@ msgid "Invoice Reference"
 msgstr "Référence facture"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nom"
@@ -3148,8 +3068,7 @@ msgstr ""
 "important."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -3234,16 +3153,11 @@ msgid "Full Account Name"
 msgstr "Nom complet du compte"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -3264,9 +3178,7 @@ msgid "Document: Customer account statement"
 msgstr "Document: Déclaration du Compte Client"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Comptabilité"
 
@@ -3306,10 +3218,8 @@ msgid "Centralisation"
 msgstr "Centralisation"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Code de taxe"
@@ -3341,14 +3251,12 @@ msgid "Readonly"
 msgstr "Lecture seule"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situation"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Ref. document"
 
@@ -3377,8 +3285,7 @@ msgid "Cancel selected invoices"
 msgstr "Annuler les factures sélectionnées"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3401,28 +3308,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Mettre en brouillon"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Document de référence à l'origine de cette facture."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Payable"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base de calcul"
 
@@ -3432,8 +3334,7 @@ msgid "Model Name"
 msgstr "Nom du modèle"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Autres"
 
@@ -3443,15 +3344,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Valider"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Légende"
 
@@ -3466,17 +3365,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3497,12 +3393,9 @@ msgid "By Date and Period"
 msgstr "Par date et période"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notes"
@@ -3516,8 +3409,7 @@ msgstr ""
 "Les mouvements générés par cette facture ont fait l'objet d'un lettrage."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3537,21 +3429,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "La saisie du relevé génère les règlements et paiements"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Code"
 
@@ -3561,8 +3447,7 @@ msgid "Financial Management"
 msgstr "Finance & Comptabilité"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Aucun"
@@ -3589,8 +3474,7 @@ msgid "Additionnal Information"
 msgstr "Commentaire"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nom de la taxe"
@@ -3657,8 +3541,7 @@ msgid "Partner Balance"
 msgstr "Balance des tiers"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Journal des tiers"
 
@@ -3673,8 +3556,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3713,8 +3595,7 @@ msgid "Import invoice"
 msgstr "Importer la facture"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Créer"
@@ -3730,8 +3611,7 @@ msgid "Invoice line"
 msgstr "Ligne de facture"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Raccourci"
 
@@ -3751,15 +3631,13 @@ msgstr ""
 "multi devise."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Compte de taxe parent"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3795,8 +3673,7 @@ msgid "Central Journal"
 msgstr "Journal centralisé"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Balance cumulée"
 
@@ -3863,8 +3740,7 @@ msgid "Journal code"
 msgstr "Journal"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Créer les écritures"
 
@@ -3919,14 +3795,11 @@ msgstr ""
 "de Taxe n'apparaissent sur les factures"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Séquence"
@@ -3984,8 +3857,7 @@ msgstr "Écritures périodiques"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Echéance"
 
@@ -4005,8 +3877,7 @@ msgid "Account Configure Wizard "
 msgstr "Assistant de configuration de compte "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Date de Début"
@@ -4044,8 +3915,7 @@ msgid "Unreconciled"
 msgstr "Non-lettré"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Note"
 
@@ -4078,8 +3948,7 @@ msgid "Entry Sequence"
 msgstr "Séquence d'écriture"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Clôturé"
 
@@ -4208,12 +4077,9 @@ msgid "Code/Date"
 msgstr "Code/Date"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Actif"
@@ -4260,20 +4126,15 @@ msgid "Secondary Currency"
 msgstr "Devise"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4306,8 +4167,7 @@ msgid "Account Move"
 msgstr "Mouvement de compte"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Écritures"
 
@@ -4389,18 +4249,15 @@ msgid "Journal Column"
 msgstr "Colonne du journal"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Clôturé"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4413,8 +4270,7 @@ msgid "Periods"
 msgstr "Périodes"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4441,8 +4297,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Imputations analytiques à refacturer aux achats, emploi du temps..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Taxes par défaut"
 
@@ -4460,8 +4315,7 @@ msgstr ""
 #. module: account
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr ""
-"Nom de l'exercice fiscal tel qu'affiché dans les éditions et rapports"
+msgstr "Nom de l'exercice fiscal tel qu'affiché dans les éditions et rapports"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -4486,8 +4340,7 @@ msgstr "Types de contrôle"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nom du compte"
 
@@ -4578,8 +4431,7 @@ msgid "Import file from your bank statement"
 msgstr "Importer ce fichier depuis le relevé de banque"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Type interne"
 
@@ -4605,14 +4457,12 @@ msgid "Posted"
 msgstr "Validé"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Avoirs"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Date de Fin"
 
@@ -4633,8 +4483,7 @@ msgid "Day of the Month"
 msgstr "Jour dans le mois"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Lignes"
 
@@ -4706,14 +4555,12 @@ msgid "The optional quantity on entries"
 msgstr "La quantité optionelle des entrées"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "États"
 
@@ -4749,8 +4596,7 @@ msgstr "Date de départ"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4857,11 +4703,9 @@ msgstr "La taxe est comprise dans le prix indiqué"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4951,12 +4795,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimer la balance agée"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Référence"
 
@@ -5025,8 +4866,7 @@ msgid "Control Invoice"
 msgstr "Contrôle de facture"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Créditeurs"
@@ -5053,8 +4893,7 @@ msgstr "TVA :"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total :"
@@ -5065,8 +4904,7 @@ msgid "account.analytic.journal"
 msgstr "Journal analytique"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Affectation des comptes"
@@ -5082,8 +4920,7 @@ msgid "Account Reconciliation"
 msgstr "Lettrage de compte"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmé"
 
@@ -5098,8 +4935,7 @@ msgid "Parent Account Template"
 msgstr "Modèle de compte parent"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -5120,8 +4956,7 @@ msgid "Analytic account"
 msgstr "Compte analytique"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
@@ -5131,22 +4966,16 @@ msgid "Valid"
 msgstr "Valide"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Débit"
@@ -5203,8 +5032,7 @@ msgid "Reporting"
 msgstr "Reporting"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5235,8 +5063,7 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Montant total"
 
@@ -5288,14 +5115,12 @@ msgid "Paid invoice"
 msgstr "Facture réglée"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Définition de la taxe"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Type de taxe"
 
@@ -5339,8 +5164,7 @@ msgid "With movements"
 msgstr "avec mouvements"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domaine"
 
@@ -5360,9 +5184,7 @@ msgid "Manually"
 msgstr "Manuellement"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5379,8 +5201,7 @@ msgid "Payable Accounts"
 msgstr "Comptes payables"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Ligne de facture"
 
@@ -5431,8 +5252,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "L'autre devise optionelle si c'est une écriture multi devise."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Paiements"
@@ -5473,12 +5293,9 @@ msgstr "Choisissez un Journal et une Date de Paiement"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Brouillon"
@@ -5505,8 +5322,7 @@ msgid "Are you sure ?"
 msgstr "Êtes-vous sûr ?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5522,22 +5338,16 @@ msgid "Supplier Invoice Process"
 msgstr "Processus des Factures Fournisseurs"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Page"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Information optionnelle"
 
@@ -5553,8 +5363,7 @@ msgid "Receivable and Payable"
 msgstr "Recevable et Payable"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5580,8 +5389,7 @@ msgstr ""
 "contiendra le montant de base (non taxé)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calculer"
@@ -5625,8 +5433,7 @@ msgid "End of period"
 msgstr "Fin de la période"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Écriture comptable"
 
@@ -5637,8 +5444,7 @@ msgid "General Journal"
 msgstr "Journal Général"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5646,12 +5452,9 @@ msgstr "Journal Général"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Solde de la balance"
@@ -5697,11 +5500,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "La séquence utilisée pour les numéros de facture de ce journal."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informations générales"
 
@@ -5743,8 +5543,7 @@ msgid "List of Accounts"
 msgstr "Liste des Comptes"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Propriétés des Ventes"
 
@@ -5821,15 +5620,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Description"
 
@@ -5949,8 +5744,7 @@ msgstr "Définition des Modèles"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Liquidités"
 
@@ -5971,8 +5765,7 @@ msgid "Future"
 msgstr "Future"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
@@ -6005,10 +5798,8 @@ msgstr ""
 "produits courante"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -6022,10 +5813,8 @@ msgid "Account Code"
 msgstr "Code du Compte"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6078,11 +5867,345 @@ msgstr "Oui"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Cochez cette case si l'utilisateur peut réconcilier les entrées dans ce "
 "compte."
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Comptes analytiques à cloturer"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Factures brouillons"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Tableau de bord comptable"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Comptes à facturer"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Coûts à facturer"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Creances âgés"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Tableau de bord du comptable"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Comptes de revenus"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Mes indicateurs"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tableau de bord de la comptabilité"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Revenus âgés"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Afficher les informations de Débit/Crédit"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Tous les comptes"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Sélection basée sur les écritures"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notification"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Période Fiscale"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balance des comptes"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Sélectioner la(les) Période(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Pourcentage"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparer l'année sélectionnée en terme de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Sélectionner la ou les Années Fiscales (Maximum Trois Ans)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Sélectionner le COmpte Référence (pour la comparaison en %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Vous avez choisi l'option 'Paysage'. Merci de vérifier."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Afficher le Rapport au Format Paysage"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Afficher la Comparaison en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Sélectionnez une Période"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Options du Rapport"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Ne pas comparer"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Afficher les Comptes"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Vous avez sélectionner plus de 3 années dans tous les cas."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Vous pouvez sélectionner un maximum de 3 années. Merci de vérifier encore."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"Vous avez sélectionné l'option 'Pourcentage' avec plus de 2 années, mais "
+"vous n'avez pas sélcetionné le format 'paysage'."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Vous avez peut être terminer en oubliant des erreurs. Merci de les corrigés "
+"et d'essayer encore."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Laisser vide pour comparer avec le parent"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Date de création"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"Vous n'avez pas sélectionné l'option 'Pourcentage', mais vous avez "
+"sélectionné plus de 2 années."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Vous devez au moins sélectionner 1 année fiscale. Essayer encore."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Personnaliser  le Rapport"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Comptes par type"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Comptes recevables"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Balance par type de compte"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semaine de l'année"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 28939b7d6ac..67967488f5b 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -91,8 +91,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Código base"
@@ -124,8 +123,7 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -186,10 +184,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -204,14 +200,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -228,12 +222,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Cantidade"
@@ -270,8 +261,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -280,14 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -303,8 +291,7 @@ msgid "Select period"
 msgstr "Seleccione período"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Orixe"
 
@@ -334,8 +321,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -354,14 +340,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -429,11 +413,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -445,8 +426,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -468,10 +448,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -662,8 +640,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -695,8 +672,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -728,8 +704,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -739,8 +714,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -760,12 +734,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -918,10 +889,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -964,16 +933,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -995,8 +961,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1118,8 +1083,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1272,8 +1236,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1295,8 +1258,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1322,11 +1284,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1395,8 +1355,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1412,8 +1371,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1439,8 +1397,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1567,8 +1524,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1578,8 +1534,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1591,14 +1546,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1762,8 +1715,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1774,8 +1726,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1821,21 +1772,9 @@ msgid "year"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,checktype,report:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
-#: wizard_button:account.analytic.account.balance.report,init,report:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
-#: wizard_button:account.analytic.account.journal.report,init,report:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
-#: wizard_button:account.central.journal.report,init,print:0
-#: wizard_button:account.general.journal.report,init,print:0
-#: wizard_button:account.general.ledger.report,checktype,checkreport:0
-#: wizard_button:account.partner.balance.report,init,report:0
-#: wizard_button:account.print.journal.report,init,print:0
-#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
@@ -1849,12 +1788,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -1968,7 +1904,7 @@ msgstr ""
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "¡XML non válido para a definición da vista!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -2002,8 +1938,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2018,8 +1953,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2092,10 +2026,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2133,8 +2065,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2186,8 +2117,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2250,13 +2180,9 @@ msgid "Date Invoiced"
 msgstr ""
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Todos os periodos se está baleiro"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2279,21 +2205,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2310,8 +2231,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2321,8 +2241,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2408,8 +2327,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2417,8 +2335,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2487,53 +2404,9 @@ msgid "From analytic accounts, Create invoice."
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,account_selection,end:0
-#: wizard_button:account.account.balance.report,checktype,end:0
-#: wizard_button:account.aged.trial.balance,init,end:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
-#: wizard_button:account.analytic.account.balance.report,init,end:0
-#: wizard_button:account.analytic.account.chart,init,end:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,end:0
-#: wizard_button:account.analytic.account.journal.report,init,end:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.line,init,end:0
-#: wizard_button:account.automatic.reconcile,init,end:0
-#: view:account.bank.statement:0
-#: wizard_button:account.central.journal.report,init,end:0
-#: wizard_button:account.chart,init,end:0
-#: wizard_button:account.fiscalyear.close,init,end:0
-#: wizard_button:account.fiscalyear.close.state,init,end:0
-#: wizard_button:account.general.journal.report,init,end:0
-#: wizard_button:account.general.ledger.report,account_selection,end:0
-#: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
-#: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
-#: wizard_button:account.move.bank.reconcile,init,end:0
-#: wizard_button:account.move.journal,init,end:0
-#: wizard_button:account.move.line.reconcile,addendum,end:0
-#: wizard_button:account.move.line.reconcile,init_full,end:0
-#: wizard_button:account.move.line.reconcile,init_partial,end:0
-#: wizard_button:account.move.line.reconcile.select,init,end:0
-#: wizard_button:account.move.line.unreconcile,init,end:0
-#: wizard_button:account.move.line.unreconcile.select,init,end:0
-#: wizard_button:account.move.validate,init,end:0
-#: wizard_button:account.open_closed_fiscalyear,init,end:0
-#: wizard_button:account.partner.balance.report,init,end:0
-#: wizard_button:account.period.close,init,end:0
-#: wizard_button:account.print.journal.report,init,end:0
-#: wizard_button:account.reconcile.unreconcile,init,end:0
-#: wizard_button:account.subscription.generate,init,end:0
-#: wizard_button:account.third_party_ledger.report,init,end:0
-#: wizard_button:account.vat.declaration,init,end:0
-#: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: wizard_button:account.balance.account.balance.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account
 #: field:account.account.type,name:0
@@ -2541,10 +2414,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2558,8 +2429,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2669,8 +2539,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2737,17 +2606,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2787,8 +2652,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2881,16 +2745,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2911,9 +2770,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2958,10 +2815,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3001,14 +2856,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3046,8 +2899,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3070,28 +2922,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3101,8 +2948,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3112,15 +2958,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3135,17 +2979,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3166,12 +3007,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3184,8 +3022,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,33 +3046,13 @@ msgstr ""
 msgid "Statement encoding produces payment entries"
 msgstr ""
 
-#. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
-msgid "Code"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3262,8 +3079,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3340,8 +3156,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3354,8 +3169,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3392,8 +3206,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3409,8 +3222,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3435,15 +3247,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3479,8 +3289,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3490,13 +3299,9 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
-#: wizard_field:account.chart,init,fiscalyear:0
-#: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
-#: wizard_field:account.partner.balance.report,init,fiscalyear:0
-#: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Exercicio fiscal"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3504,10 +3309,9 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Con balance se non é igual a 0"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -3556,8 +3360,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3613,14 +3416,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3686,8 +3486,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3707,8 +3506,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3746,8 +3544,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3771,8 +3568,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3893,12 +3689,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3950,24 +3743,10 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,credit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,cost:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Crédito"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -3994,8 +3773,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4087,32 +3865,19 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
-#: field:account.fiscalyear,period_ids:0
-#: wizard_field:account.general.ledger.report,checktype,periods:0
-#: wizard_field:account.partner.balance.report,init,periods:0
-#: wizard_field:account.third_party_ledger.report,init,periods:0
-#: wizard_field:account.vat.declaration,init,periods:0
-#: model:ir.actions.act_window,name:account.action_account_period_form
-#: model:ir.ui.menu,name:account.menu_action_account_period_form
-#: model:ir.ui.menu,name:account.next_id_23
+#: wizard_field:account.balance.account.balance.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Periodos"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4139,8 +3904,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4149,6 +3913,8 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
+"especial!"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4191,12 +3957,10 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nome da conta"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4204,9 +3968,10 @@ msgid "Payment date"
 msgstr ""
 
 #. module: account
-#: wizard_button:account_use_models,create,end:0
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4285,8 +4050,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4312,14 +4076,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4340,8 +4102,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4359,8 +4120,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4420,14 +4180,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4463,8 +4221,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4581,11 +4338,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4680,12 +4435,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4762,8 +4514,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4787,23 +4538,13 @@ msgstr ""
 msgid "VAT:"
 msgstr ""
 
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
-#: rml:account.invoice:0
-msgid "Total:"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4819,8 +4560,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4835,8 +4575,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4854,8 +4593,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4865,25 +4603,10 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,debit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,revenue:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Débito"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
@@ -4942,8 +4665,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4959,9 +4681,10 @@ msgid "Analytic Check -"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Balance de conta -"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4974,8 +4697,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5025,14 +4747,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5067,14 +4787,12 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr "Mantén secuencias de facturas con exercicio fiscal"
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "Con movementos"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5099,9 +4817,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5118,8 +4834,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5170,8 +4885,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5217,12 +4931,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5249,8 +4960,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5286,22 +4996,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5317,8 +5021,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5341,8 +5044,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5386,8 +5088,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5398,24 +5099,10 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Balance"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5456,11 +5143,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5499,8 +5183,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5593,15 +5276,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5645,8 +5324,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,11 +5405,9 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Efectivo"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5769,8 +5445,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5817,10 +5492,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5854,10 +5527,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5914,8 +5585,7 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5923,9 +5593,326 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
-#, python-format
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostrar información débito/crédito"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas as contas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selección de entradas baseada en"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificación"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periodo financeiro"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balance contábel"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Selecciona período(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Porcentaxe"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparar exercicios seleccionados en térmos de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Seleccionar exercicio(s) fiscai(s) (máximo 3 exercicios)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selecciona conta de referencia (para comparación %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Balance contábel-Compara exercicios"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"O módulo de balance de contas é unha funcionalidade engadida ao módulo de "
+"xestión financieira.\n"
+"\n"
+"    Este módulo ofrece diversas opcións de impresión de balances.\n"
+"\n"
+"    1. Podese comparar o balance de distintos anos.\n"
+"\n"
+"    2. Pode establecer a comparación en importe ou porcentual entre dous "
+"anos.\n"
+"\n"
+"    3. Pode establecer a conta de referencia para a comparación porcentual "
+"para anos en particular.\n"
+"\n"
+"    4. Pode seleccionar períodos como unha data real ou períodos como data "
+"de creación.\n"
+"\n"
+"    5. Pode imprimir o informe que desexe en formato apaisado.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Debe seleccionar a opción 'Horizontal'. Por favor, márquea."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar informe en formato horizontal"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparación en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selecciona período"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opcións do informe"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Non comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar contas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Debe seleccionar máis de 3 exercicios en calquera caso."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Xestión contable e financieira - Comparación de contas"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Ano :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Pode seleccionar un máximo de 3 exercicios. Por favor, seleccione outra vez."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Seleccionou a opción 'Porcentaxe' con máis de 2 exercicios, pero non "
+"seleccionou formato horizontal."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Podería ter cometido os seguintes erros. Por favor, corríxaos e ténteo de "
+"novo."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Deixalo baleiro para comparar cos seus pais"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Creación de data"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. Non seleccionou a opción 'Porcentaxe', pero seleccionou máis de 2 "
+"exercicios."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Pode ter seleccionado as opcións comparar con máis dun 1 exercicio con "
+"columnas crédito/débito e opción %. Isto pode ocasionar que haxa contidos "
+"que se impriman fóra do papel. Por favor, inténteo de novo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+"Debe seleccionar a lo menos un exercicio fiscal. Por favor, inténteo de novo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Informe personalizado"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Contas por tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Contas a cobrar"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo por tipo de conta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana do ano"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid "Total:"
+#~ msgstr "Total:"
+
 #~ msgid "Warning !"
 #~ msgstr "Aviso !"
 
 #~ msgid "Disc. (%)"
 #~ msgstr "Desc. (%)"
+
+#~ msgid "Account Information"
+#~ msgstr "Información da conta"
+
+#~ msgid "Printing date:"
+#~ msgstr "Data impresión:"
+
+#~ msgid "at"
+#~ msgstr "ás"
+
+#~ msgid "Currency:"
+#~ msgstr "Moeda:"
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 835eadf6575..6b9f594a80e 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Osnovna Šifra"
@@ -118,13 +117,12 @@ msgid "Journal Voucher"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Preostali"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,10 +290,9 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -428,14 +412,9 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
-#: view:account.subscription:0
+#: field:report.invoice.created,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
@@ -444,8 +423,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +445,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +637,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -684,9 +659,9 @@ msgid "Additional Information"
 msgstr ""
 
 #. module: account
-#: selection:account.invoice,type:0
+#: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca  kupcu"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -694,8 +669,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +701,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +711,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +731,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -917,10 +886,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -963,16 +930,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +958,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1041,11 +1004,9 @@ msgid "Amount paid"
 msgstr ""
 
 #. module: account
-#: selection:account.invoice,type:0
-#: model:process.transition,name:account.process_transition_customerinvoice0
-#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun Stranke"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1117,8 +1078,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1271,8 +1231,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1253,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1279,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1394,8 +1350,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1366,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1392,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1519,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1529,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1541,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1609,9 +1558,9 @@ msgid "Total quantity"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,date_due:0
+#: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Datum dospijeća"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
@@ -1761,8 +1710,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1721,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1820,21 +1767,9 @@ msgid "year"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,checktype,report:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
-#: wizard_button:account.analytic.account.balance.report,init,report:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
-#: wizard_button:account.analytic.account.journal.report,init,report:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
-#: wizard_button:account.central.journal.report,init,print:0
-#: wizard_button:account.general.journal.report,init,print:0
-#: wizard_button:account.general.ledger.report,checktype,checkreport:0
-#: wizard_button:account.partner.balance.report,init,report:0
-#: wizard_button:account.print.journal.report,init,print:0
-#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
@@ -1847,15 +1782,9 @@ msgid "x Expenses Credit Notes Journal"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account
 #: view:account.journal:0
@@ -1967,7 +1896,7 @@ msgstr ""
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -2001,8 +1930,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2015,16 +1943,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,partner_id:0
-#: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
-#: field:account.move,partner_id:0
-#: wizard_field:account.partner.balance.report,init,result_selection:0
-#: wizard_field:account.third_party_ledger.report,init,result_selection:0
-#: field:wizard.company.setup,partner_id:0
+#: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2086,18 +2007,9 @@ msgid "Past"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,company_currency_id:0
-#: field:account.bank.accounts.wizard,currency_id:0
-#: field:account.bank.statement,currency:0
-#: field:account.bank.statement.reconcile,total_currency:0
-#: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
-#: field:account.move.line,currency_id:0
+#: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2132,8 +2044,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2096,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2244,9 +2154,9 @@ msgid "Customer Taxes"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2278,21 +2188,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2214,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2224,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2310,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2318,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2407,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2428,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2438,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2453,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2563,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2699,9 +2593,9 @@ msgid "Select Period and Journal for Validation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,number:0
+#: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -2714,9 +2608,9 @@ msgid "O_k"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Bez poreza"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -2736,17 +2630,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2786,8 +2676,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2769,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2794,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2957,10 +2839,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2880,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2923,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2946,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +2972,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +2982,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3003,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3031,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3046,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3071,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3089,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3116,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3339,8 +3193,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3206,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3243,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3259,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,19 +3284,14 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
-#: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
-#: field:account.analytic.account,type:0
-#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tip Tvrtke Kupca"
 
 #. module: account
 #: view:res.partner:0
@@ -3478,8 +3323,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3399,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3455,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3525,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3545,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3583,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3607,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3728,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3949,24 +3782,9 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,credit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,cost:0
+#: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -3993,8 +3811,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3903,13 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
-#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3922,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4119,12 +3930,9 @@ msgid "Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.account,state:0
-#: selection:account.invoice,state:0
-#: wizard_button:account.open_closed_fiscalyear,init,open:0
-#: wizard_button:account_use_models,create,open_move:0
+#: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
@@ -4138,8 +3946,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4148,6 +3955,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv objekta mora početi sa x_ i ne smije sadržavati specijalne znakove !"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4190,12 +3998,10 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "Naziv računa"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4284,8 +4090,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4311,14 +4116,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4339,8 +4142,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4160,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4220,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4458,14 +4257,9 @@ msgid "Date Start"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -4580,11 +4374,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4471,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4707,9 +4496,9 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.invoice,state:0
+#: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Poništeno"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4761,8 +4550,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4789,8 +4577,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4588,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4818,8 +4604,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4834,8 +4619,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,10 +4637,9 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun Dobavljača"
 
 #. module: account
 #: selection:account.move.line,state:0
@@ -4864,25 +4647,10 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,debit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,revenue:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Dugovanje"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
@@ -4941,8 +4709,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4740,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5024,14 +4790,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5072,8 +4836,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5098,17 +4861,9 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
-#: selection:account.vat.declaration,init,based_on:0
-#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
-#: model:ir.actions.act_window,name:account.action_invoice_tree
-#: model:ir.actions.report.xml,name:account.account_invoices
-#: model:ir.ui.menu,name:account.menu_finance_invoice
-#: wizard_field:populate_statement_from_inv,go,lines:0
+#: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "računi"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -5117,8 +4872,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5169,8 +4923,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5214,17 +4967,9 @@ msgid "Choose Journal and Payment Date"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.account,state:0
-#: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
-#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: account
 #: rml:account.overdue:0
@@ -5248,8 +4993,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5029,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5316,8 +5054,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5077,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5385,8 +5121,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,24 +5132,10 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5455,11 +5176,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5487,9 +5205,9 @@ msgid "Moves"
 msgstr ""
 
 #. module: account
-#: selection:account.invoice,state:0
+#: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_form
@@ -5498,8 +5216,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5589,20 +5306,9 @@ msgid "IntraCom"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.account:0
-#: field:account.analytic.account,description:0
-#: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
-#: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5644,8 +5350,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,8 +5432,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5768,10 +5472,9 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Namirenje dobavljača"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -5816,10 +5519,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5554,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5612,338 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Svi računi"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Odabir stavaka zasnovan na"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Obavijest"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Financijsko razdoblje"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo računa"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Odaberite razdoblja"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Raspon Mjeseci"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Računi kreirani u zadnjih 15 dana"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Izvještaj o računima kreiranima u zadnjih 15 dana"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Ukupni iznos"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Tvrtke kupci po tipu"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Stara potraživanja do danas"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Konta Potraživanja"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Raspon"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Izvještavanje o tvrtki Kupcu - Izvještavanje"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo po tipu konta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Tjedan"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Kreiraj datum"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Stara potraživanja"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Iznos bez poreza"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 7af537af96a..8f5d0ded4a3 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Nem egyeztetett tételek"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Adóalap kód"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr "Időszak összesen"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Számítási kód (ha a típus = Python kód)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Könyvelési tranzakció sor"
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Összeg"
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr "Válasszon időszakot"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr "Tartozik forgalom"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Adó"
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr "Analitikus számla"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Napló neve"
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr "Részösszeg :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Beszerzés tulajdonságok"
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Státusz"
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Mennyiség"
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr "Nettó összesen:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Egységár"
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr "Nem egyeztetett tranzakciók"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "nézet"
 
@@ -1394,8 +1354,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr "Napló"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Gyerek számlák"
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Partner hiv."
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr "Időszak hossza (napok)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Százalék"
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr "Grafikonok"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Típus"
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr "Napló időszak neve"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr "múlt"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Pénznem"
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr "Tételes"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "konszolidáció"
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Dátum"
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Adó típus"
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr "Záró dátum"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Információ"
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr "Ár"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr "Számla hivatkozás"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Név"
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr "Számla megnevezés"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2910,11 +2826,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: model:ir.ui.menu,name:account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "Könyvelés"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Adókód"
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokumentum"
 
@@ -3047,8 +2957,7 @@ msgid "Cancel selected invoices"
 msgstr "Kijelölt számlák érvénytelenítése"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3071,28 +2980,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Piszkozat"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "kötelezettségek"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3102,8 +3006,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "egyéb"
 
@@ -3113,15 +3016,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3136,17 +3037,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3167,12 +3065,9 @@ msgid "By Date and Period"
 msgstr "Dátum és időszak"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3185,8 +3080,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3211,21 +3105,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kód"
 
@@ -3235,8 +3123,7 @@ msgid "Financial Management"
 msgstr "Pénzügy"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3263,8 +3150,7 @@ msgid "Additionnal Information"
 msgstr "Megjegyzés"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Adónév"
@@ -3341,8 +3227,7 @@ msgid "Partner Balance"
 msgstr "Partner egyenleg"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3355,8 +3240,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3393,8 +3277,7 @@ msgid "Import invoice"
 msgstr "Számlaimport"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Létrehoz"
@@ -3410,8 +3293,7 @@ msgid "Invoice line"
 msgstr "Számla sor"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3436,15 +3318,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Szülő adó egyenleg"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3480,8 +3360,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3557,8 +3436,7 @@ msgid "Journal code"
 msgstr "Naplókód"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Tételek létrehozása"
 
@@ -3614,14 +3492,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sorszám"
@@ -3687,8 +3562,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3708,8 +3582,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Kezdő dátum"
@@ -3747,8 +3620,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3772,8 +3644,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "lezárt"
 
@@ -3894,12 +3765,9 @@ msgid "Code/Date"
 msgstr "Kód/Dátum"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktív"
@@ -3951,20 +3819,15 @@ msgid "Secondary Currency"
 msgstr "Pénznem"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3995,8 +3858,7 @@ msgid "Account Move"
 msgstr "Kontírozás"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Bankkivonat sorok"
 
@@ -4088,18 +3950,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4112,8 +3971,7 @@ msgid "Periods"
 msgstr "Időszakok"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4140,8 +3998,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Alapértelmezett adó"
 
@@ -4194,8 +4051,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4286,8 +4142,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Belső típus"
 
@@ -4313,14 +4168,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Záró dátum"
 
@@ -4341,8 +4194,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4360,8 +4212,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4421,14 +4272,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Állapotok"
 
@@ -4464,8 +4313,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Összesen"
 
@@ -4582,11 +4430,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4681,12 +4527,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Korosbított kivonat nyomtatás"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Hiv."
 
@@ -4763,8 +4606,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "követelések"
@@ -4791,8 +4633,7 @@ msgstr "ÁFA:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Összesen:"
@@ -4803,8 +4644,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4820,8 +4660,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4836,8 +4675,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4855,8 +4693,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Szállítói számla"
 
@@ -4866,22 +4703,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Tartozik"
@@ -4943,8 +4774,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4975,8 +4805,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5026,14 +4855,12 @@ msgid "Paid invoice"
 msgstr "Kifizetett számla"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5074,8 +4901,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Tartomány"
 
@@ -5100,9 +4926,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5119,8 +4943,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Számlasor"
 
@@ -5171,8 +4994,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5218,12 +5040,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5250,8 +5069,7 @@ msgid "Are you sure ?"
 msgstr "Biztos benne?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5287,22 +5105,16 @@ msgid "Supplier Invoice Process"
 msgstr "Szállítói számla folyamat"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5318,8 +5130,7 @@ msgid "Receivable and Payable"
 msgstr "követelések és kötelezettségek"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5342,8 +5153,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5387,8 +5197,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5399,8 +5208,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5408,12 +5216,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5457,11 +5262,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Általános adatok"
 
@@ -5500,8 +5302,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5594,15 +5395,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5646,8 +5443,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5729,8 +5525,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5770,8 +5565,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Szállítói jóváírás"
 
@@ -5820,10 +5614,8 @@ msgstr ""
 "Költségszámla vagy készlet esetén elhatárolás számla."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5857,10 +5649,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5917,11 +5707,338 @@ msgstr "Igen"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 25108aed572..f2b1a962337 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -56,7 +56,7 @@ msgstr "Aktiva"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nama model tidak valid di definsi aksi"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -91,8 +91,7 @@ msgid "Unreconciled entries"
 msgstr "Transaksi belum direkonsolidasi"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Kode Dasar"
@@ -124,8 +123,7 @@ msgid "Residual"
 msgstr "Sisa"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -186,10 +184,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Nama transaksi"
 
@@ -204,14 +200,12 @@ msgid "Period Sum"
 msgstr "Total Periode"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Kode Program (if type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Baris Entri Rekening"
 
@@ -228,12 +222,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Jumlah"
@@ -270,8 +261,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -280,14 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Baku"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -303,8 +291,7 @@ msgid "Select period"
 msgstr "Pilih periode"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Asal"
 
@@ -334,8 +321,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Pajak"
@@ -354,14 +340,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -429,11 +413,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Status"
@@ -445,8 +426,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Perhitungan khusus"
 
@@ -468,10 +448,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -662,8 +640,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -695,8 +672,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -728,8 +704,7 @@ msgid "Field Name"
 msgstr "Nama Kolom"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -739,8 +714,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -760,12 +734,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Status"
 
@@ -918,10 +889,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kwantitas"
@@ -964,16 +933,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -995,8 +961,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1118,8 +1083,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Harga Satuan"
 
@@ -1272,8 +1236,7 @@ msgid "Not reconciled transactions"
 msgstr "Bukan transaksi yang dapat direkonsiliasi"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1295,8 +1258,7 @@ msgid "Write-Off account"
 msgstr "Akun penghapusan"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1322,11 +1284,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Tampilan"
 
@@ -1395,8 +1355,7 @@ msgstr "Tipe Akun"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1412,8 +1371,7 @@ msgid "Journal"
 msgstr "Jurnal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1439,8 +1397,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Biarkan kosong untuk menggunkan akun pendapatan"
 
@@ -1567,8 +1524,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1578,8 +1534,7 @@ msgid "Account to reconcile"
 msgstr "Akun yang akan direkonsoliasi"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Ref. Rekanan"
@@ -1591,14 +1546,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1762,8 +1715,7 @@ msgid "Period length (days)"
 msgstr "Lama periode(hari)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Persen"
@@ -1774,8 +1726,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1849,12 +1800,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Jenis"
 
@@ -1968,7 +1916,7 @@ msgstr ""
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak valid untuk Tampilkan Arsitektur!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -2002,8 +1950,7 @@ msgid "Journal-Period Name"
 msgstr "Nama Periode Jurnal"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2018,8 +1965,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2092,10 +2038,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2133,8 +2077,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2186,8 +2129,7 @@ msgid "Detail"
 msgstr "Detil"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidasi"
 
@@ -2279,21 +2221,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Tanggal"
@@ -2310,8 +2247,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Jenis Pajak"
 
@@ -2321,8 +2257,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2408,8 +2343,7 @@ msgid "Date End"
 msgstr "Tanggal Akhir"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2417,8 +2351,7 @@ msgid "Entry Lines"
 msgstr "Baris Input"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Kode Terapan (if type=code)"
 
@@ -2507,11 +2440,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2530,8 +2461,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Batal"
 
@@ -2541,10 +2471,8 @@ msgid "Acc. Type Name"
 msgstr "Nama Jenis Akun"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2558,8 +2486,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Keterangan"
@@ -2669,8 +2596,7 @@ msgid "Price"
 msgstr "Harga"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2737,17 +2663,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nama"
@@ -2787,8 +2709,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2881,16 +2802,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2911,11 +2827,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: model:ir.ui.menu,name:account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "Akunting"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2958,10 +2872,8 @@ msgid "Centralisation"
 msgstr "Pemusatan"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Kode Pajak"
@@ -3001,14 +2913,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situasi"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokumen"
 
@@ -3046,8 +2956,7 @@ msgid "Cancel selected invoices"
 msgstr "Batalkan invoice terpilih"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3070,28 +2979,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Hutang"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Dasar"
 
@@ -3101,8 +3005,7 @@ msgid "Model Name"
 msgstr "Nama model"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3112,15 +3015,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validasi"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3135,17 +3036,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3166,12 +3064,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Catatan"
@@ -3184,8 +3079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3210,21 +3104,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kode"
 
@@ -3234,8 +3122,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Tidak ada"
@@ -3262,8 +3149,7 @@ msgid "Additionnal Information"
 msgstr "Informasi Tambahan"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nama Pajak"
@@ -3340,8 +3226,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3354,8 +3239,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3392,8 +3276,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Membuat"
@@ -3409,8 +3292,7 @@ msgid "Invoice line"
 msgstr "Detail Invoice"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
@@ -3435,15 +3317,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Induk Akun pajak"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3479,8 +3359,7 @@ msgid "Central Journal"
 msgstr "Jurnal Pusat"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3556,8 +3435,7 @@ msgid "Journal code"
 msgstr "Kode jurnal"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Membuat inputan"
 
@@ -3613,14 +3491,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3686,8 +3561,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3707,8 +3581,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3746,8 +3619,7 @@ msgid "Unreconciled"
 msgstr "Belum direkonsoliasi"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Catatan"
 
@@ -3771,8 +3643,7 @@ msgid "Entry Sequence"
 msgstr "Urutan Entri"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Ditutup"
 
@@ -3893,12 +3764,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktif"
@@ -3950,20 +3818,15 @@ msgid "Secondary Currency"
 msgstr "Mata uang kedua"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3994,8 +3857,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4087,18 +3949,15 @@ msgid "Journal Column"
 msgstr "Kolom Jurnal"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Selesai"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4111,8 +3970,7 @@ msgid "Periods"
 msgstr "Periode"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4139,8 +3997,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4193,8 +4050,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nama Akun"
 
@@ -4285,8 +4141,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4312,14 +4167,12 @@ msgid "Posted"
 msgstr "Posted"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4340,8 +4193,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Baris"
 
@@ -4359,8 +4211,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Keterangan Pajak"
 
@@ -4420,14 +4271,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Status"
 
@@ -4463,8 +4312,7 @@ msgstr "Mulai Tanggal"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4581,11 +4429,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4680,12 +4526,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4735,10 +4578,9 @@ msgid "Account cost and revenue by journal (This Month)"
 msgstr "Aku biaya dan pendapatan berdasarkan jurnal(bulan ini)"
 
 #. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Akun yang Dapat Diterima"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4762,8 +4604,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Piutang"
@@ -4790,8 +4631,7 @@ msgstr "PPN :"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4802,8 +4642,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4819,8 +4658,7 @@ msgid "Account Reconciliation"
 msgstr "Akun Rekonsoliasi"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Konfirmasi"
 
@@ -4835,8 +4673,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4856,8 +4693,7 @@ msgid "Analytic account"
 msgstr "Akun Analisis"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Faktur Pembelian"
 
@@ -4867,22 +4703,16 @@ msgid "Valid"
 msgstr "Valid"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debit"
@@ -4944,8 +4774,7 @@ msgid "Reporting"
 msgstr "Pelaporan"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4976,8 +4805,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5027,14 +4855,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Pendifinisian Pajak"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Kelompok Pajak"
 
@@ -5075,8 +4901,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Filter"
 
@@ -5101,9 +4926,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5120,8 +4943,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5172,8 +4994,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5219,12 +5040,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Draft"
@@ -5251,8 +5069,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5288,22 +5105,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5319,8 +5130,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5343,8 +5153,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5388,8 +5197,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5400,24 +5208,10 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5458,11 +5252,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5501,8 +5292,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5595,15 +5385,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5647,8 +5433,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5730,8 +5515,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5771,8 +5555,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5819,10 +5602,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5856,10 +5637,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5916,11 +5695,338 @@ msgstr "Ya"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Akun analitik yang ditutup"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Draf faktur"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Dasbor Akunting"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Akun ke faktur"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Biaya ke faktur"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Usia lanjut yang dapat diterima"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Bord untuk akuntan"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Akun Penerimaan"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Indikator saya"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Papan Akun"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Usia pemasukan"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Tampilkan Informasi Debit/Kredit"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Pemberitahuan"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Neraca Saldo"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Pilihan Periode"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Pilihlah tahun pembukuan(Max. 3 tahun)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Memilih Akun referensi (untuk perbandingan bentuk %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Neraca Saldo - Perbandingan Tahun"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Menampilakan Laporan dalam bentuk Lanscape"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Menampilkan perbandingan dalam %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Pilihan Periode"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Pilihan Laporan"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Menampilkan Akun-akun"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Anda dapat memilih lebih dari 3 tahun pada beberapa kasus"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Mengatur Laporan"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Akun berdasarkan tipe"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Akun Piutang"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo berdasarkan Jenis Akun"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Minggu dalam setahun"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index f8776b33f04..80b62684781 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-15 07:00+0000\n"
+"PO-Revision-Date: 2010-07-05 10:24+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "Fatture fornitori non pagate"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "Codifica delle registrazioni"
+msgstr "Movimenti contabili"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -4581,7 +4581,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
 #: model:ir.ui.menu,name:account.menu_encode_entries_by_move
 msgid "Entries Encoding by Move"
-msgstr "Codifica delle registrazioni per movimento"
+msgstr "Registrazioni per movimento"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -5959,3 +5959,332 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 86a5ee261b1..2a79f2427aa 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -91,8 +91,7 @@ msgid "Unreconciled entries"
 msgstr "조정되지 않은 엔트리"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "베이스 코드"
@@ -124,8 +123,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -186,10 +184,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -204,14 +200,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -228,12 +222,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -270,8 +261,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -280,14 +270,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -303,8 +291,7 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -334,8 +321,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -354,14 +340,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -429,11 +413,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -445,8 +426,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -468,10 +448,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -662,8 +640,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -695,8 +672,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -728,8 +704,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -739,8 +714,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -760,12 +734,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -918,10 +889,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -964,16 +933,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -995,8 +961,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1118,8 +1083,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1272,8 +1236,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1295,8 +1258,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1322,11 +1284,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1395,8 +1355,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1412,8 +1371,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1439,8 +1397,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1567,8 +1524,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1578,8 +1534,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1591,14 +1546,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1762,8 +1715,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1774,8 +1726,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1821,21 +1772,9 @@ msgid "year"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,checktype,report:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
-#: wizard_button:account.analytic.account.balance.report,init,report:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
-#: wizard_button:account.analytic.account.journal.report,init,report:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
-#: wizard_button:account.central.journal.report,init,print:0
-#: wizard_button:account.general.journal.report,init,print:0
-#: wizard_button:account.general.ledger.report,checktype,checkreport:0
-#: wizard_button:account.partner.balance.report,init,report:0
-#: wizard_button:account.print.journal.report,init,print:0
-#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "인쇄"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
@@ -1849,12 +1788,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2002,8 +1938,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2018,8 +1953,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2092,10 +2026,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2133,8 +2065,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2186,8 +2117,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2250,13 +2180,9 @@ msgid "Date Invoiced"
 msgstr ""
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "비워두면 모든 기간이 적용됩니다."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2279,21 +2205,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2310,8 +2231,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2321,8 +2241,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2408,8 +2327,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2417,8 +2335,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2487,53 +2404,9 @@ msgid "From analytic accounts, Create invoice."
 msgstr ""
 
 #. module: account
-#: wizard_button:account.account.balance.report,account_selection,end:0
-#: wizard_button:account.account.balance.report,checktype,end:0
-#: wizard_button:account.aged.trial.balance,init,end:0
-#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
-#: wizard_button:account.analytic.account.balance.report,init,end:0
-#: wizard_button:account.analytic.account.chart,init,end:0
-#: wizard_button:account.analytic.account.cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.account.inverted.balance.report,init,end:0
-#: wizard_button:account.analytic.account.journal.report,init,end:0
-#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,end:0
-#: wizard_button:account.analytic.line,init,end:0
-#: wizard_button:account.automatic.reconcile,init,end:0
-#: view:account.bank.statement:0
-#: wizard_button:account.central.journal.report,init,end:0
-#: wizard_button:account.chart,init,end:0
-#: wizard_button:account.fiscalyear.close,init,end:0
-#: wizard_button:account.fiscalyear.close.state,init,end:0
-#: wizard_button:account.general.journal.report,init,end:0
-#: wizard_button:account.general.ledger.report,account_selection,end:0
-#: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
-#: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
-#: wizard_button:account.move.bank.reconcile,init,end:0
-#: wizard_button:account.move.journal,init,end:0
-#: wizard_button:account.move.line.reconcile,addendum,end:0
-#: wizard_button:account.move.line.reconcile,init_full,end:0
-#: wizard_button:account.move.line.reconcile,init_partial,end:0
-#: wizard_button:account.move.line.reconcile.select,init,end:0
-#: wizard_button:account.move.line.unreconcile,init,end:0
-#: wizard_button:account.move.line.unreconcile.select,init,end:0
-#: wizard_button:account.move.validate,init,end:0
-#: wizard_button:account.open_closed_fiscalyear,init,end:0
-#: wizard_button:account.partner.balance.report,init,end:0
-#: wizard_button:account.period.close,init,end:0
-#: wizard_button:account.print.journal.report,init,end:0
-#: wizard_button:account.reconcile.unreconcile,init,end:0
-#: wizard_button:account.subscription.generate,init,end:0
-#: wizard_button:account.third_party_ledger.report,init,end:0
-#: wizard_button:account.vat.declaration,init,end:0
-#: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: wizard_button:account.balance.account.balance.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "취소"
 
 #. module: account
 #: field:account.account.type,name:0
@@ -2541,10 +2414,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2558,8 +2429,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2669,8 +2539,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2737,17 +2606,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2787,8 +2652,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2881,16 +2745,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2911,11 +2770,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: model:ir.ui.menu,name:account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "회계"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2958,10 +2815,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3001,14 +2856,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3046,8 +2899,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3070,28 +2922,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3101,8 +2948,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3112,15 +2958,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3135,17 +2979,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3166,12 +3007,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3184,8 +3022,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,33 +3046,13 @@ msgstr ""
 msgid "Statement encoding produces payment entries"
 msgstr ""
 
-#. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
-msgid "Code"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3262,8 +3079,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3340,8 +3156,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3354,8 +3169,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3392,8 +3206,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3409,8 +3222,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3435,15 +3247,13 @@ msgid ""
 msgstr "다중 통화 엔트리의 경우, 선택적인 다른 통화로 표현된 금액"
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3479,8 +3289,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3490,13 +3299,9 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
-#: wizard_field:account.chart,init,fiscalyear:0
-#: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
-#: wizard_field:account.partner.balance.report,init,fiscalyear:0
-#: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "회계년도"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3504,10 +3309,9 @@ msgid "Balance :"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "밸런스가 0이 아닌"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -3556,8 +3360,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3613,14 +3416,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3686,8 +3486,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3707,8 +3506,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3746,8 +3544,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3771,8 +3568,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3893,12 +3689,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3950,24 +3743,9 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,credit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,cost:0
+#: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "대변"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -3994,8 +3772,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4087,32 +3864,19 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
-#: field:account.fiscalyear,period_ids:0
-#: wizard_field:account.general.ledger.report,checktype,periods:0
-#: wizard_field:account.partner.balance.report,init,periods:0
-#: wizard_field:account.third_party_ledger.report,init,periods:0
-#: wizard_field:account.vat.declaration,init,periods:0
-#: model:ir.actions.act_window,name:account.action_account_period_form
-#: model:ir.ui.menu,name:account.menu_action_account_period_form
-#: model:ir.ui.menu,name:account.next_id_23
+#: wizard_field:account.balance.account.balance.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "기간"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4139,8 +3903,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4191,12 +3954,10 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "계정 이름"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4204,9 +3965,10 @@ msgid "Payment date"
 msgstr ""
 
 #. module: account
-#: wizard_button:account_use_models,create,end:0
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4285,8 +4047,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4312,14 +4073,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4340,8 +4099,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4359,8 +4117,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4420,14 +4177,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4463,8 +4218,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4581,11 +4335,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4680,12 +4432,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4735,10 +4484,9 @@ msgid "Account cost and revenue by journal (This Month)"
 msgstr ""
 
 #. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "채권 계정"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4762,8 +4510,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4787,23 +4534,13 @@ msgstr ""
 msgid "VAT:"
 msgstr ""
 
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
-#: rml:account.invoice:0
-msgid "Total:"
-msgstr ""
-
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4819,8 +4556,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4835,8 +4571,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4854,8 +4589,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4865,25 +4599,9 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,debit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,revenue:0
+#: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "차변"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
@@ -4942,8 +4660,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4974,8 +4691,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5025,14 +4741,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5067,14 +4781,12 @@ msgid "Maintains Invoice sequences with Fiscal Year"
 msgstr ""
 
 #. module: account
-#: selection:account.account.balance.report,checktype,display_account:0
-#: selection:account.general.ledger.report,checktype,display_account:0
+#: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "무브먼트와 함께"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5099,9 +4811,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5118,8 +4828,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5170,8 +4879,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5217,12 +4925,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5249,8 +4954,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5286,22 +4990,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5317,8 +5015,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5341,8 +5038,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5386,8 +5082,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5398,24 +5093,10 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "밸런스"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5456,11 +5137,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5499,8 +5177,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5593,15 +5270,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5645,8 +5318,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,11 +5399,9 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "현금"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5769,8 +5439,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5817,10 +5486,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5854,10 +5521,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5914,8 +5579,7 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5923,34 +5587,374 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
-#, python-format
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "닫을 분석 계정"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "초안 인보이스"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "인보이스할 계정"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "인보이스할 원가"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "오래된 채권"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "회계사 위원회"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "소득 계정"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "내 지시자"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "계정 위원회"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "오래된 소득"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "차변/대변 정보 보기"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "모든 계정"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "엔트리 선정의 기준"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "통지"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "회계 기간"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "계정 밸런스"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "기간 선택"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "퍼센트"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "선택한 년도들의 비교 기준"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "선택된 회계년도 (최대 3년)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "참조 계정을 선택하십시오 (% 비교)."
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "계정 밸런스-비교 년도들"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "\"랜드스케이프\" 옵션을 선택해야 합니다. 체크하십시오."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "팬드스케이프 폼으로 리포트 보기"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "%로 비교"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "기간 선택"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "리포트 옵션"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "비교하지 않습니다."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "계정 보기"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. 3년 이상을 선택하면 안됩니다."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "최대 3년 간을 선택할 수 있습니다."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. 2년 이상을 '퍼센트' 옵션으로 선택했지만, 랜드스케이프 포맷을 선택하지 않았"
+"습니다."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr "다음과 같은 실수가 있었습니다. 교정한 뒤 다시 시도하십시오."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "페어런트와 비교를 원하면 비워두십시오."
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "생성 날짜"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr "2. 2년 이상을 선택하면서, '퍼센트' 옵션을 선택하지 않았습니다."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"적어도 1년 이상을 대변/차변 칼럼과 % 옵션으로 비교하는 것을 선택했습니다. 그"
+"렇게 하면 페이지의 인쇄 범주를 넘어 서게 됩니다. 다시 시도하십시오."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "적어도 1년 이상의 회계년도를 선택하십시오."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "리포트 커스터마이즈"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "타입 별 계정"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "채권 계정"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "계정 타입 별 밸런스"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#~ msgid "Code"
+#~ msgstr "코드"
+
+#~ msgid "Total:"
+#~ msgstr "합계:"
+
 #~ msgid "No Period found on Invoice!"
 #~ msgstr "인보이스에 기간이 없습니다."
 
-#, python-format
 #~ msgid ""
-#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
-#~ "defined !"
+#~ "The Payment Term of Supplier does not have Payment Term Lines"
+#~ "(Computation) defined !"
 #~ msgstr "공급자의 결제 조건에 정의된 결제 조건 라인 (결제)이 없습니다 !"
 
-#, python-format
 #~ msgid "Data Insufficient !"
 #~ msgstr "데이터 부족!"
 
-#, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "통합성 오류!"
 
-#, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "당기에 정의된 마감 저널이 없음"
 
-#, python-format
 #~ msgid ""
-#~ "Specified Journal does not have any account move entries in draft state for "
-#~ "this period"
+#~ "Specified Journal does not have any account move entries in draft state "
+#~ "for this period"
 #~ msgstr "이 기간에는 지정된 저널의 초안 상태 계정 이동 엔트리가 없습니다"
 
-#, python-format
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "계정이동 라인 \"%s\"은 유효하지 않습니다"
+
+#~ msgid "Printing date:"
+#~ msgstr "인쇄 날짜:"
+
+#~ msgid "Account Information"
+#~ msgstr "계정 정보"
+
+#~ msgid "Currency:"
+#~ msgstr "통화:"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index cd61fa0d9ed..a95a1361ea2 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Nesugretinti įrašai"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Bazės kodas"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr "Perkelti pasirinktą eilutę"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Įrašo žymė"
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr "Periodo suma"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Apskaičiuoti Kodą (jei tipas=kodas)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Sąskaitos įrašo eilutė"
 
@@ -227,12 +221,9 @@ msgstr "Pasikartojantys įrašai"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Kiekis"
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fiksuotas"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Priminimo pažyma"
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr "Parinkite periodą"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Kilmės vieta"
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Mokestis"
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr "Analitinė sąskaita"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Žurnalo pavadinimas"
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Apskritis, rajonas:"
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Neapmokėti tiekėjo grąžinimai"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Specialus apskaičiavimas"
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Nuoroda"
@@ -665,8 +643,7 @@ msgid "Sub-Total :"
 msgstr "Dalinė suma :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -698,8 +675,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -731,8 +707,7 @@ msgid "Field Name"
 msgstr "Lauko Pavadinimas"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Ženklas, naudojamas skaičiuojant aukštesnįjį mokestį."
 
@@ -742,8 +717,7 @@ msgid "End of Year Entries Journal"
 msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Pirkimo ypatybės"
 
@@ -763,12 +737,9 @@ msgid "Move Lines Created."
 msgstr "Sukurti didžiosios knygos įrašai."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Būsena"
 
@@ -923,10 +894,8 @@ msgstr "Pasirinkite sąskaitų planą"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Kiekis"
@@ -969,16 +938,13 @@ msgstr "analitinė sąskaita faktūra"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1000,8 +966,7 @@ msgid "Net Total:"
 msgstr "Iš viso be mokesčių:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1125,8 +1090,7 @@ msgid "Fiscal Position Templates"
 msgstr "Fiskalinės pozicijos šablonai"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Vieneto kaina"
 
@@ -1279,8 +1243,7 @@ msgid "Not reconciled transactions"
 msgstr "Nesugretintos transakcijos"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mokesčių nustatymai"
@@ -1302,8 +1265,7 @@ msgid "Write-Off account"
 msgstr "Nurašymų sąskaita"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelis"
 
@@ -1329,11 +1291,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Žiūrėti"
 
@@ -1404,8 +1364,7 @@ msgstr "Sąskaitų tipai"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1421,8 +1380,7 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Žemesniosios sąskaitos"
 
@@ -1448,8 +1406,7 @@ msgid "Statement reconcile line"
 msgstr "Dokumento sugretinimo eilutė"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 
@@ -1576,8 +1533,7 @@ msgid "Account n°"
 msgstr "Sąskaitos Nr."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Norėdami naudoti sąnaudų sąskaitą, palikite tuščią"
 
@@ -1587,8 +1543,7 @@ msgid "Account to reconcile"
 msgstr "Sąskaita sugertinimui"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Kontrahento nuoroda"
@@ -1600,14 +1555,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Debetinės ir kreditinės sąskaitos"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Periodiniai įrašai"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1771,8 +1724,7 @@ msgid "Period length (days)"
 msgstr "Periodo trukmė (dienomis)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentų"
@@ -1783,8 +1735,7 @@ msgid "Charts"
 msgstr "Sąskaitų planas"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1859,12 +1810,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipas"
 
@@ -2012,8 +1960,7 @@ msgid "Journal-Period Name"
 msgstr "Žurnalo-periodo pavadinimas"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Mokesčio pavadinimas"
 
@@ -2030,8 +1977,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2106,10 +2052,8 @@ msgstr "Praeitis"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valiuta"
@@ -2147,8 +2091,7 @@ msgid "Analytic Entry"
 msgstr "Analitinis įrašas"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2200,8 +2143,7 @@ msgid "Detail"
 msgstr "Išsamiai"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsilidacija"
 
@@ -2266,13 +2208,9 @@ msgid "Date Invoiced"
 msgstr "Sąskaitos faktūros data"
 
 #. module: account
-#: help:account.account.balance.report,checktype,periods:0
-#: help:account.general.ledger.report,checktype,periods:0
-#: help:account.partner.balance.report,init,periods:0
-#: help:account.third_party_ledger.report,init,periods:0
-#: help:account.vat.declaration,init,periods:0
+#: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Visi periodai tušti"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2297,21 +2235,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Deklaruojama mokesčių suma"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2328,8 +2261,7 @@ msgid "Unreconcile"
 msgstr "Panaikinti sugretinimą"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Mokesčių tipas"
 
@@ -2339,8 +2271,7 @@ msgid "Statement Entries"
 msgstr "Dokumentų įrašai"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Naudotojas"
 
@@ -2428,8 +2359,7 @@ msgid "Date End"
 msgstr "Pabaigos data"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2437,8 +2367,7 @@ msgid "Entry Lines"
 msgstr "Įrašo eilutės"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Pritaikomas Kodas (jei tipas=kodas)"
 
@@ -2527,11 +2456,9 @@ msgstr "Iš analitinių sąskaitų sukuriama sąskaita faktūra"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2550,8 +2477,7 @@ msgstr "Iš analitinių sąskaitų sukuriama sąskaita faktūra"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -2561,10 +2487,8 @@ msgid "Acc. Type Name"
 msgstr "Sąsk. tipo pavadinimas"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2578,8 +2502,7 @@ msgid "Litigation"
 msgstr "Ginčytinas"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informacija"
@@ -2691,8 +2614,7 @@ msgid "Price"
 msgstr "Kaina"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2759,17 +2681,13 @@ msgid "Invoice Reference"
 msgstr "Sąskaitos faktūros nuoroda"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Pavadinimas"
@@ -2809,8 +2727,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2903,16 +2820,11 @@ msgid "Full Account Name"
 msgstr "Sąskaitos pavadinimas"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2933,9 +2845,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Apskaita"
 
@@ -2980,10 +2890,8 @@ msgid "Centralisation"
 msgstr "Centralizacija"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Mokesčių kodas"
@@ -3023,14 +2931,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situacija"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokumentas"
 
@@ -3068,8 +2974,7 @@ msgid "Cancel selected invoices"
 msgstr "Atšaukti parinktas sąskaitas faktūras"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3092,28 +2997,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Nustatyti kaip juodraštį"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Dokumento, kuris sugeneravo šią sąskaitą faktūrą nuoroda."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Kreditoriai"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Bazė"
 
@@ -3123,8 +3023,7 @@ msgid "Model Name"
 msgstr "Modelio pavadinimas"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Kita"
 
@@ -3134,15 +3033,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Patvirtinti"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3157,17 +3054,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3188,12 +3082,9 @@ msgid "By Date and Period"
 msgstr "Pagal datą ir periodą"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Pastabos"
@@ -3206,8 +3097,7 @@ msgid ""
 msgstr "Sąskaitos faktūros DK įrašai sugretinti su mokėjimų DK įrašais."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3232,21 +3122,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Dokumentai padeda sukurti mokėjimo eilutes"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kodas"
 
@@ -3256,8 +3140,7 @@ msgid "Financial Management"
 msgstr "Finansų valdymas"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nieko"
@@ -3285,8 +3168,7 @@ msgid "Additionnal Information"
 msgstr "Papildoma informacija"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Mokesčio pavadinimas"
@@ -3363,8 +3245,7 @@ msgid "Partner Balance"
 msgstr "Kontrahento likutis"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Kontrahento žurnalas"
 
@@ -3373,13 +3254,11 @@ msgstr "Kontrahento žurnalas"
 msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
-msgstr ""
-"Ši sąskaita bus naudojama vietoj numatytosios, pirkėjo skolai žymėti."
+msgstr "Ši sąskaita bus naudojama vietoj numatytosios, pirkėjo skolai žymėti."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3418,8 +3297,7 @@ msgid "Import invoice"
 msgstr "Importuoti sąskaitą faktūrą"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Sukurti"
@@ -3435,8 +3313,7 @@ msgid "Invoice line"
 msgstr "Sąskaitos faktūros eilutė"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Nuoroda"
 
@@ -3465,15 +3342,13 @@ msgstr ""
 "valiutų įrašai."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Aukštesnioji mokesčių sąskaita"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3509,8 +3384,7 @@ msgid "Central Journal"
 msgstr "Centrinis žurnalas"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3586,8 +3460,7 @@ msgid "Journal code"
 msgstr "Žurnalo kodas"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Sukurti įrašus"
 
@@ -3645,14 +3518,11 @@ msgstr ""
 "mokesčio kodu būtų rodomas sąskaitoje faktūroje."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Seka"
@@ -3720,8 +3590,7 @@ msgstr "Periodiniai įrašai"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Mokėjimo data"
 
@@ -3741,8 +3610,7 @@ msgid "Account Configure Wizard "
 msgstr "Sąskaitų konfigūravimo vedlys "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3780,8 +3648,7 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Pastaba"
 
@@ -3805,8 +3672,7 @@ msgid "Entry Sequence"
 msgstr "Įrašų seka"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Uždaryta"
 
@@ -3931,12 +3797,9 @@ msgid "Code/Date"
 msgstr "Kodas/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktyvus"
@@ -3988,20 +3851,15 @@ msgid "Secondary Currency"
 msgstr "Antroji valiuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4034,8 +3892,7 @@ msgid "Account Move"
 msgstr "Didžiosios knygos įrašai"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Dokumento eilutės"
 
@@ -4132,18 +3989,15 @@ msgid "Journal Column"
 msgstr "Žurnalo stulpelis"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Atlikta"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4156,8 +4010,7 @@ msgid "Periods"
 msgstr "Periodai"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4184,8 +4037,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Numatytieji mokesčiai"
 
@@ -4242,8 +4094,7 @@ msgstr "Tipų kontrolė"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Sąskaitos pavadinimas"
 
@@ -4334,8 +4185,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Vidinis tipas"
 
@@ -4361,14 +4211,12 @@ msgid "Posted"
 msgstr "Užregistruota"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Grąžinimas"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4389,8 +4237,7 @@ msgid "Day of the Month"
 msgstr "Mėnesio diena"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Eilutės"
 
@@ -4411,8 +4258,7 @@ msgstr ""
 "mokesčių. Šiuo atveju vertinimo seka yra svarbi."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Mokesčių deklaracija"
 
@@ -4472,14 +4318,12 @@ msgid "The optional quantity on entries"
 msgstr "Rodomas kiekis įrašuose"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Būsenos"
 
@@ -4515,8 +4359,7 @@ msgstr "Pradžios data"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Iš viso"
 
@@ -4633,11 +4476,9 @@ msgstr "Patvirtinti įrašus iš sąskaitos faktūros"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4734,12 +4575,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Spausdinti bandomąjį balansą"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Nuoroda"
 
@@ -4816,8 +4654,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Gautinos sumos"
@@ -4844,8 +4681,7 @@ msgstr "PVM:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Iš viso:"
@@ -4856,8 +4692,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Sąskaitų nustatymai"
@@ -4873,8 +4708,7 @@ msgid "Account Reconciliation"
 msgstr "Sąskaitos sugretinimas"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Patvirtinti"
 
@@ -4889,8 +4723,7 @@ msgid "Parent Account Template"
 msgstr "Aukštesnysis sąskaitos šablonas"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4908,8 +4741,7 @@ msgid "Analytic account"
 msgstr "Analitinė sąskaita"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tiekėjo sąskaita faktūra"
 
@@ -4919,22 +4751,16 @@ msgid "Valid"
 msgstr "Patvirtinta"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debetas"
@@ -4996,8 +4822,7 @@ msgid "Reporting"
 msgstr "Ataskaitos"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5028,8 +4853,7 @@ msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Iš viso"
 
@@ -5079,14 +4903,12 @@ msgid "Paid invoice"
 msgstr "Apmokėta sąskaita"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Mokesčio aprašymas"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Mokesčių grupė"
 
@@ -5129,8 +4951,7 @@ msgid "With movements"
 msgstr "Su DK įrašais"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Sritis"
 
@@ -5155,9 +4976,7 @@ msgid "Manually"
 msgstr "Rankiniu būdu"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5174,8 +4993,7 @@ msgid "Payable Accounts"
 msgstr "Kreditinės sąskaitos"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Sąskaitos faktūros eilutė"
 
@@ -5226,8 +5044,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Pasirenkama kita valiuta, jeigu tai kelių valiutų įrašas."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Mokėjimai"
@@ -5273,12 +5090,9 @@ msgstr "Pasirinkti žurnalą ir mokėjimo datą"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Juodraštis"
@@ -5305,8 +5119,7 @@ msgid "Are you sure ?"
 msgstr "Jūs esate įsitikinęs?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Išankstinė sąskaita"
 
@@ -5342,22 +5155,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Puslapis"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Papildoma informacija"
 
@@ -5373,8 +5180,7 @@ msgid "Receivable and Payable"
 msgstr "Mokėtinos ir gautinos"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5397,8 +5203,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Skaičiuoti"
@@ -5442,8 +5247,7 @@ msgid "End of period"
 msgstr "Periodo pabaiga"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Sąskaitos įrašas"
 
@@ -5454,8 +5258,7 @@ msgid "General Journal"
 msgstr "Bendrasis žurnalas"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5463,12 +5266,9 @@ msgstr "Bendrasis žurnalas"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Likutis"
@@ -5514,11 +5314,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Seka naudojama šiame žurnale sąskaitoms faktūroms numeruoti."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Bendroji informacija"
 
@@ -5560,8 +5357,7 @@ msgid "List of Accounts"
 msgstr "Sąskaitų sąrašas"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Pardavimų nustatymai"
 
@@ -5654,15 +5450,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Aprašas"
 
@@ -5710,8 +5502,7 @@ msgstr ""
 "kontrahentui."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Įvykio kodas"
 
@@ -5793,8 +5584,7 @@ msgstr "Modelių apibrėžimai"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Grynieji"
 
@@ -5834,8 +5624,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Palikite tuščią visiems atviriems fiskaliniams metams."
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Grąžinimas tiekėjui"
 
@@ -5882,10 +5671,8 @@ msgid ""
 msgstr "Sąskaita bus naudojama įvertinti siunčiamas atsargas."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5919,10 +5706,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Fiskalinių metų pavadinimas rodomas ekrane."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5981,8 +5766,7 @@ msgstr "Taip"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Pažymėkite, jeigu norite, kad vartotojas galėtų kurti sugretinimo įrašus "
 "šiai sąskaitai."
@@ -5991,3 +5775,331 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Sukurti įrašus"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Rodyti debeto/kredito informaciją"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Visos sąskaitos"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Įrašų pasirinkimas pagrįstas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Perspėjimas"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Financinis periodas"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Sąskaitos balansas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Parinkti periodą(-us)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Procentaliai"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Palyginti pasirinktus metus pagal"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Parinkti fiskalinius metus (daugiausia tris metus)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Sąskaitos balansas-Palyginimo metai"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Parodyti palyginimą %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Pasirinkti periodą"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Ataskaitos nustatymai"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Nelyginti"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Rodyti sąskaitas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Sukūrimo data"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index fada23d11fb..4215e4cd316 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -93,8 +93,7 @@ msgid "Unreconciled entries"
 msgstr "Niet afgeletterde boekingen"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Basiscode"
@@ -126,8 +125,7 @@ msgid "Residual"
 msgstr "Resterend"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -192,10 +190,8 @@ msgid "Move line select"
 msgstr "Veplaats geselecteerde regel"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Boekingskenmerk"
 
@@ -210,14 +206,12 @@ msgid "Period Sum"
 msgstr "Periodiek bedrag"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Bereken code (if type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Boekingsregel"
 
@@ -234,12 +228,9 @@ msgstr "Periodieke boekingen"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Bedrag"
@@ -280,8 +271,7 @@ msgstr ""
 "weergave aanmaken voor een snellere codering in elk dagboek."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -295,14 +285,12 @@ msgstr ""
 "vervaldata berekenen, bijvoorbeeld 50% nu en 50% over een maand."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Vastgezet"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Betalingsherinnering"
 
@@ -318,8 +306,7 @@ msgid "Select period"
 msgstr "Selecteer periode"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Brondocument"
 
@@ -349,8 +336,7 @@ msgid "Delta Debit"
 msgstr "Richting debet"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Belastingen"
@@ -369,14 +355,12 @@ msgid "Analytic Account"
 msgstr "Kostenplaatsen"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Belasting over onderliggende"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Naam dagboek"
@@ -444,11 +428,8 @@ msgid "Contra"
 msgstr "Tegenover"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Status"
@@ -460,8 +441,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Niet-betaalde credit inkoopfacturen"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Special bewerking"
 
@@ -483,10 +463,8 @@ msgid "Disc.(%)"
 msgstr "Korting. (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -683,8 +661,7 @@ msgid "Sub-Total :"
 msgstr "Subtotaal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -716,8 +693,7 @@ msgid "Select the Period for Analysis"
 msgstr "Kies de analyseperiode"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -749,8 +725,7 @@ msgid "Field Name"
 msgstr "Veldnaam"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Kenmerk bovenliggende"
 
@@ -760,8 +735,7 @@ msgid "End of Year Entries Journal"
 msgstr "Jaarafsluiting dagboek"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Inkoopeigenschappen"
 
@@ -781,12 +755,9 @@ msgid "Move Lines Created."
 msgstr "Boekingen aangemaakt"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Status"
 
@@ -943,10 +914,8 @@ msgstr "Selecteer grootboekschema"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Aantal"
@@ -989,16 +958,13 @@ msgstr "Kostenplaats factuur"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1020,8 +986,7 @@ msgid "Net Total:"
 msgstr "Netto totaal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1145,8 +1110,7 @@ msgid "Fiscal Position Templates"
 msgstr "Fiscale situatie sjablonen"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Eenheidsprijs"
 
@@ -1304,8 +1268,7 @@ msgid "Not reconciled transactions"
 msgstr "Niet afgeletterde transacties"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Vervangingstabel belasting"
@@ -1327,8 +1290,7 @@ msgid "Write-Off account"
 msgstr "Grootboekkaart afboekingen"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1354,11 +1316,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Selecteer facturen welke u wilt betalen."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Aanzicht"
 
@@ -1429,8 +1389,7 @@ msgstr "Categoriën grootboekrekeningen"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1446,8 +1405,7 @@ msgid "Journal"
 msgstr "Dagboek"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Subrekeningen"
 
@@ -1473,8 +1431,7 @@ msgid "Statement reconcile line"
 msgstr "Afschrift verrekeningsregel"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Laat leeg om de inkomsten rekening te gebruiken"
 
@@ -1603,8 +1560,7 @@ msgid "Account n°"
 msgstr "Rekening n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Laat leeg om de uitgaven grootboekkaart te gebruiken"
 
@@ -1614,8 +1570,7 @@ msgid "Account to reconcile"
 msgstr "Af te letteren grootboekkaart"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Relatie ref."
@@ -1627,14 +1582,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "\"Te ontvangen\" en \"Te betalen\" rekeningen"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Verdeelregels"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1799,8 +1752,7 @@ msgid "Period length (days)"
 msgstr "Duur periode (dagen)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
@@ -1811,8 +1763,7 @@ msgid "Charts"
 msgstr "Rekeningschema's"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1887,12 +1838,9 @@ msgstr "Uitgaven credit nota's dagboek"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Type"
 
@@ -2040,8 +1988,7 @@ msgid "Journal-Period Name"
 msgstr "Naam dagboekperiode"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Naam belasting"
 
@@ -2059,8 +2006,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2135,10 +2081,8 @@ msgstr "Voorgaande"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuta"
@@ -2176,8 +2120,7 @@ msgid "Analytic Entry"
 msgstr "Kostenplaatsboeking"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Aanmaningsbericht"
 
@@ -2229,8 +2172,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidatie"
 
@@ -2327,21 +2269,16 @@ msgid "The account basis of the tax declaration."
 msgstr "De grootboekrekening van de belastingverklaring"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
@@ -2358,8 +2295,7 @@ msgid "Unreconcile"
 msgstr "Maak afletteren ongedaan"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Soort belasting"
 
@@ -2369,8 +2305,7 @@ msgid "Statement Entries"
 msgstr "Afschrift mutaties"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
@@ -2460,8 +2395,7 @@ msgid "Date End"
 msgstr "Einddatum"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2469,8 +2403,7 @@ msgid "Entry Lines"
 msgstr "Mutatie regels"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Van Toepassing zijnde Code (IF type=code)"
 
@@ -2559,11 +2492,9 @@ msgstr "Van analytische rekeningen, Maak factuur."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2582,8 +2513,7 @@ msgstr "Van analytische rekeningen, Maak factuur."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -2593,10 +2523,8 @@ msgid "Acc. Type Name"
 msgstr "Rekeningsoortnaam"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2610,8 +2538,7 @@ msgid "Litigation"
 msgstr "Betwist"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informatie"
@@ -2728,8 +2655,7 @@ msgid "Price"
 msgstr "Prijs"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2796,17 +2722,13 @@ msgid "Invoice Reference"
 msgstr "Factuurreferentie"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Naam"
@@ -2849,8 +2771,7 @@ msgstr ""
 "belastingen. In dat geval bepaalt het de volgorde van berekeningen."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2943,16 +2864,11 @@ msgid "Full Account Name"
 msgstr "Volledige naam rekening"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2973,9 +2889,7 @@ msgid "Document: Customer account statement"
 msgstr "Document: Boekhoudkundige klantverklaring"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Financiële verwerking"
 
@@ -3020,10 +2934,8 @@ msgid "Centralisation"
 msgstr "Centralisatie"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Belastingpercentage"
@@ -3066,14 +2978,12 @@ msgstr ""
 "relatie."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situatie"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Document"
 
@@ -3113,8 +3023,7 @@ msgid "Cancel selected invoices"
 msgstr "Annuleer de geselecteerde facturen"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3137,28 +3046,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Naar Concept"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referentie naar document welke ten grondslag ligt aan de factuur."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Passiva"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Basisbedrag"
 
@@ -3168,8 +3072,7 @@ msgid "Model Name"
 msgstr "Transactienaam"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Andere"
 
@@ -3179,23 +3082,20 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Bevestig"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr ""
-"Voorgestelde factuur wordt gecontroleerd, akkoord gegeven en geprint."
+msgstr "Voorgestelde factuur wordt gecontroleerd, akkoord gegeven en geprint."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
@@ -3203,17 +3103,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3234,12 +3131,9 @@ msgid "By Date and Period"
 msgstr "Op datum en periode"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notities"
@@ -3254,8 +3148,7 @@ msgstr ""
 "afgeletterd met de boekingen van de betalingen."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3280,21 +3173,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Afschrift verwerking maakt betaalingsmutaties aan"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Code"
 
@@ -3304,8 +3191,7 @@ msgid "Financial Management"
 msgstr "Financiële administratie"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Geen"
@@ -3332,8 +3218,7 @@ msgid "Additionnal Information"
 msgstr "Extra Informatie"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Toeslagnaam"
@@ -3410,8 +3295,7 @@ msgid "Partner Balance"
 msgstr "Ouderdomsanalyse per relatie"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Relatie administratie"
 
@@ -3426,8 +3310,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3467,8 +3350,7 @@ msgid "Import invoice"
 msgstr "Importeer factuur"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Aanmaken"
@@ -3484,8 +3366,7 @@ msgid "Invoice line"
 msgstr "Factuurregel"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Afkorting"
 
@@ -3514,15 +3395,13 @@ msgstr ""
 "valuta boeking is."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Bovenliggende belastingkaart"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3558,8 +3437,7 @@ msgid "Central Journal"
 msgstr "Centraal dagboek"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Voortgebracht saldo"
 
@@ -3635,8 +3513,7 @@ msgid "Journal code"
 msgstr "Dagboekcode"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Creëer boekingen"
 
@@ -3696,14 +3573,11 @@ msgstr ""
 "facturen wilt."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Reeks"
@@ -3771,8 +3645,7 @@ msgstr "Grootboekkaart verdeling"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Vervaldatum"
 
@@ -3792,8 +3665,7 @@ msgid "Account Configure Wizard "
 msgstr "Administratie configuratie assistent "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Startdatum"
@@ -3831,8 +3703,7 @@ msgid "Unreconciled"
 msgstr "Unreconciled"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Notitie"
 
@@ -3865,8 +3736,7 @@ msgid "Entry Sequence"
 msgstr "Boekstukreeks"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Afgesloten"
 
@@ -3996,12 +3866,9 @@ msgid "Code/Date"
 msgstr "Code/Datum"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Actief"
@@ -4053,20 +3920,15 @@ msgid "Secondary Currency"
 msgstr "Valuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4100,8 +3962,7 @@ msgid "Account Move"
 msgstr "Transactie"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Mutatieregels"
 
@@ -4198,18 +4059,15 @@ msgid "Journal Column"
 msgstr "Dagboekkolom"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Verwerkt"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4222,8 +4080,7 @@ msgid "Periods"
 msgstr "Periodes"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4247,12 +4104,10 @@ msgstr "Zoek boekingen"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
-"Analytische kosten voor herfacturering van inkopen, tijdschema's, ..."
+msgstr "Analytische kosten voor herfacturering van inkopen, tijdschema's, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Standaard belastingen"
 
@@ -4311,8 +4166,7 @@ msgstr "Soort controls"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Rekeningnaam"
 
@@ -4403,8 +4257,7 @@ msgid "Import file from your bank statement"
 msgstr "Importbestand voor uw bankafschriften"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Interne soort"
 
@@ -4430,14 +4283,12 @@ msgid "Posted"
 msgstr "Verstuurd"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Creditfacturen"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Einddatum"
 
@@ -4458,8 +4309,7 @@ msgid "Day of the Month"
 msgstr "Dag van de maand"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Regels"
 
@@ -4480,8 +4330,7 @@ msgstr ""
 "belastingen. In dat geval bepaalt het de volgorde van berekening."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Belastingaangifte"
 
@@ -4541,14 +4390,12 @@ msgid "The optional quantity on entries"
 msgstr "De optionele hoeveelheid in boekingen"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Provincies"
 
@@ -4584,8 +4431,7 @@ msgstr "Begindatum"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Totaal"
 
@@ -4704,11 +4550,9 @@ msgstr "Geldige boekingen van de factuur"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4805,12 +4649,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Druk ouderdomsanalyse af"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4890,8 +4731,7 @@ msgid "Control Invoice"
 msgstr "Beheer factuur"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Te ontvangen"
@@ -4918,8 +4758,7 @@ msgstr "BTW:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Totaal:"
@@ -4930,8 +4769,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Vervangingstabel grootboekrekeningen"
@@ -4947,8 +4785,7 @@ msgid "Account Reconciliation"
 msgstr "Account Reconciliation"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -4963,8 +4800,7 @@ msgid "Parent Account Template"
 msgstr "Bovenliggerde grootboekkaart template"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4985,8 +4821,7 @@ msgid "Analytic account"
 msgstr "Kostenplaatsen"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Inkoopfactuur"
 
@@ -4996,22 +4831,16 @@ msgid "Valid"
 msgstr "Geldig"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debet"
@@ -5073,8 +4902,7 @@ msgid "Reporting"
 msgstr "Rapportering"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5105,8 +4933,7 @@ msgid "Configuration"
 msgstr "Instellingen"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Totaalbedrag"
 
@@ -5158,14 +4985,12 @@ msgid "Paid invoice"
 msgstr "Betaalde factuur"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Belasting instellingen"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Belastinggroep"
 
@@ -5208,8 +5033,7 @@ msgid "With movements"
 msgstr "Met mutaties"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domein"
 
@@ -5234,9 +5058,7 @@ msgid "Manually"
 msgstr "Handmatig"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5253,8 +5075,7 @@ msgid "Payable Accounts"
 msgstr "Crediteuren"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Factuurregel"
 
@@ -5305,8 +5126,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "De optionele andere valuta als het een multi-valuta boeking is."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Betalingen"
@@ -5352,12 +5172,9 @@ msgstr "Kies dagboek en betaaldatum"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Concept"
@@ -5384,8 +5201,7 @@ msgid "Are you sure ?"
 msgstr "Weet u het zeker ?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PROFORMA"
 
@@ -5421,22 +5237,16 @@ msgid "Supplier Invoice Process"
 msgstr "Inkoopfactuur afhandelen"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Pagina"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Optionele informatie"
 
@@ -5452,8 +5262,7 @@ msgid "Receivable and Payable"
 msgstr "Te betalen en te ontvangen"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5479,8 +5288,7 @@ msgstr ""
 "is, dan zal het veld de grondslag voor belasting bevatten (zonder belasting)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Bereken"
@@ -5488,8 +5296,7 @@ msgstr "Bereken"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
-"De inkomsten of uitgaven rekening gerelateerd aan het gekozen produkt."
+msgstr "De inkomsten of uitgaven rekening gerelateerd aan het gekozen produkt."
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -5525,8 +5332,7 @@ msgid "End of period"
 msgstr "Einde van periode"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Boeking"
 
@@ -5537,8 +5343,7 @@ msgid "General Journal"
 msgstr "Algemeen dagboek"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5546,12 +5351,9 @@ msgstr "Algemeen dagboek"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5597,11 +5399,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "De gebruikte reeks voor factuurnummering in dit dagboek"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Algemene informatie"
 
@@ -5643,8 +5442,7 @@ msgid "List of Accounts"
 msgstr "Lijst grootboekrekeningen"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Verkoopinstellingen"
 
@@ -5737,15 +5535,11 @@ msgstr "IntraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -5793,8 +5587,7 @@ msgstr ""
 "crediteurenrekening van de huidige relatie."
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Code"
 
@@ -5876,8 +5669,7 @@ msgstr "Model definities"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Contanten"
 
@@ -5917,8 +5709,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Laat leeg voor alle open boekjaren"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Credit inkoopfactuur"
 
@@ -5967,10 +5758,8 @@ msgstr ""
 "voor de huidige productcategorie."
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -6004,10 +5793,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Naam van boekjaar welke wordt laten zien op scherm"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6066,8 +5853,7 @@ msgstr "Ja"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Vink dit aan als het de gebruiker is toegestaan om posten op deze rekening "
 "af te letteren."
@@ -6077,5 +5863,354 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Bereken mutatie data"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Af te sluiten kostenplaatsen"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Concept-facturen"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Financieel dashboard"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Te factureren rekeningen"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Te factureren kosten"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Te late debiteuren"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Dashboard voor accountant"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Inkomsten-rekeningen"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Mijn indicatoren"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Financieel dashboard"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Te late inkomsten"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Toon debet-/credit informatie"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Alle rekeningen"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Keuze gebaseerd op"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Melding"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periode"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Rekeningsaldo"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Kies periode(n)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Percentage"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Vergelijk geselecteerde jaren in termen van"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Kies boekjaar/boekjaren (Max 3 jaar)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Kies referentie rekening (voor % vergelijking)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Rekening saldi-Vergelijk boekjaren"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Account Balans is een uitbreiding van de Financieel Beheer module.\n"
+"    Deze module geeft u meerder mogelijkheden om een balans af te drukken.\n"
+"    1. U kunt de balans van verschillende boekjaren met elkaar vergelijken\n"
+"    2. U kunt een vergelijking uitdrukken in percentages of bedragen.\n"
+"    3. U kunt referentierekeningen gebruiken voor de vergelijking van "
+"specifieke boekjaren.\n"
+"    4. U kunt perioden kiezen op basis van effectieve datum of op basis van "
+"aanmaakdatum.\n"
+"    5. U krijgt een optie om het gewenste overzicht in liggend formaat af te "
+"drukken.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+"U dient de 'Liggend' afdrukstand te kiezen. Controleer dit alstublieft."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Toon overzicht in liggend formaat"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Totaal :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Toon vergelijking in %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Kies periode"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opties overzicht"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Niet vergelijken"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Toon rekeningen"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. U heeft meer dan 3 boekjaren gekozen"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Boekhouding en financieel beheer-Vergelijk rekeningen"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Jaar :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "U  kunt maximaal 3 boekjaren kiezen. Probeer opnieuw."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. U heeft de 'Percentage' optie gebruikt met meer dan 2 boekjaren, maar u "
+"hebt niet het liggend formaat gekozen."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Het kan zijn dat u één van onderstaande vergissingen hebt gemaakt. Corrigeer "
+"deze alstublieft en probeer het dan opnieuw."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Leeg laten voor vergelijking met de bovenliggende"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Aanmaakdatum"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. U heeft de 'Percentage' optie niet gekozen, maar u hebt meer dan 2 "
+"boekjaren geselecteerd."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Misschien heeft u de vergelijk optie gebruikt met meer dan 1 jaar met credit/"
+"debet kolommen en % optie. Dit kan er toe leiden dat er buiten de marges van "
+"het papier wordt afgedrukt. Probeer het opnieuw."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "U dient tenminste 1 boekjaar te selecteren. Probeer opnieuw."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Overzicht aanpassen"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Binnen een maand"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Facturen gemaakt binnen de laatste 15 dagen"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Overzicht van facturen gemaakt binnen de laatste 15 dagen"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Totaalbedrag"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Rekeningen per soort"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Te late betalingen tot vandaag"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "'Te ontvangen' rekeningen"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Bereik"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Een module die nieuwe overzichten toevoegt aan de account-module"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Financiële overzichten - Overzichten"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo per rekeningsoort"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Weeknummer"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Aanmaakdatum"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Te late betalers"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Onbelast bedrag"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index d93941404b7..61baf65405a 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Niet afgeletterde boekingen"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Basiscode"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1394,8 +1354,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2826,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2955,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2978,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +3004,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +3014,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3035,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3063,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3103,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3121,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3148,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3339,8 +3225,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3238,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3275,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3291,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,15 +3316,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3358,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3434,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3490,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3560,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3580,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3618,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3642,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3763,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3949,20 +3817,15 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3856,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3948,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3969,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3996,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4193,8 +4050,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4285,8 +4141,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4312,14 +4167,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4340,8 +4193,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4359,8 +4211,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4420,14 +4271,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4463,8 +4312,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4581,11 +4429,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4680,12 +4526,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4762,8 +4605,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4790,8 +4632,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4802,8 +4643,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4819,8 +4659,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4835,8 +4674,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4854,8 +4692,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4865,22 +4702,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4942,8 +4773,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4974,8 +4804,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5025,14 +4854,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5073,8 +4900,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5099,9 +4925,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5118,8 +4942,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5170,8 +4993,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5217,12 +5039,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5249,8 +5068,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5286,22 +5104,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5317,8 +5129,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5341,8 +5152,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5386,8 +5196,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5398,8 +5207,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5407,12 +5215,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5456,11 +5261,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5499,8 +5301,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5593,15 +5394,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5645,8 +5442,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5728,8 +5524,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5769,8 +5564,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5817,10 +5611,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5854,10 +5646,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5914,8 +5704,7 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5923,10 +5712,144 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #~ msgid ""
 #~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
+#~ "consider the present one as void. Do not hesitate to contact our "
+#~ "accounting departement at +32 81 81 37 00."
 #~ msgstr ""
 #~ "Indien dit schrijven uw betaling mocht kruisen, mag u dit negeren. Aarzel "
 #~ "niet om contact op te nemen met onze boekhouding voor eventuele vragen."
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 7c708412af5..6060252952b 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -93,8 +93,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Compte de basa"
@@ -126,8 +125,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -188,10 +186,8 @@ msgid "Move line select"
 msgstr "Desplaçar la linha seleccionada"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Libellat de l'escritura"
 
@@ -206,14 +202,12 @@ msgid "Period Sum"
 msgstr "Montant total del periòde"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Còde de Calcul (se tipe=còde)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Linha d'escritura comptabla"
 
@@ -230,12 +224,9 @@ msgstr "Escrituras recurentas"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Montant"
@@ -272,8 +263,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -282,14 +272,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Retard de règlament"
 
@@ -305,8 +293,7 @@ msgid "Select period"
 msgstr "Seleccionatz un periòde"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origina"
 
@@ -336,8 +323,7 @@ msgid "Delta Debit"
 msgstr "Dèlta de debit"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Impòstes e taxas"
@@ -356,14 +342,12 @@ msgid "Analytic Account"
 msgstr "Centre de còstes"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nom del jornal"
@@ -431,11 +415,8 @@ msgid "Contra"
 msgstr "Contracte"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estat"
@@ -447,8 +428,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Calcul particular"
 
@@ -470,10 +450,8 @@ msgid "Disc.(%)"
 msgstr "Rem.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref."
@@ -664,8 +642,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -697,8 +674,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -730,8 +706,7 @@ msgid "Field Name"
 msgstr "Nom del camp"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -741,8 +716,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -762,12 +736,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Estat"
 
@@ -920,10 +891,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantitat"
@@ -966,16 +935,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -997,8 +963,7 @@ msgid "Net Total:"
 msgstr "Total net :"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1120,8 +1085,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1274,8 +1238,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1297,8 +1260,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modèl"
 
@@ -1324,11 +1286,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Afichatge"
 
@@ -1397,8 +1357,7 @@ msgstr "Tipes de compte"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1414,8 +1373,7 @@ msgid "Journal"
 msgstr "Jornal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Comptes enfant"
 
@@ -1441,8 +1399,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1569,8 +1526,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1580,8 +1536,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1593,14 +1548,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1764,8 +1717,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "per cent"
@@ -1776,8 +1728,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1851,12 +1802,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipe"
 
@@ -2004,8 +1952,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2020,8 +1967,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2094,10 +2040,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Devisa"
@@ -2135,8 +2079,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2188,8 +2131,7 @@ msgid "Detail"
 msgstr "Detalh"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidacion"
 
@@ -2281,21 +2223,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2312,8 +2249,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2323,8 +2259,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Utilizaire"
 
@@ -2410,8 +2345,7 @@ msgid "Date End"
 msgstr "Data de fin"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2419,8 +2353,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2509,11 +2442,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2532,8 +2463,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Anullar"
 
@@ -2543,10 +2473,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2560,8 +2488,7 @@ msgid "Litigation"
 msgstr "Litigi"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Entresenhas"
@@ -2671,8 +2598,7 @@ msgid "Price"
 msgstr "Prètz"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2739,17 +2665,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nom"
@@ -2789,8 +2711,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2883,16 +2804,11 @@ msgid "Full Account Name"
 msgstr "Nom complet del compte"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2913,9 +2829,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Comptabilitat"
 
@@ -2960,10 +2874,8 @@ msgid "Centralisation"
 msgstr "Centralizacion"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3003,14 +2915,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situacion"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Document"
 
@@ -3048,8 +2958,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3072,28 +2981,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "De pagar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Basa"
 
@@ -3103,8 +3007,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Autres"
 
@@ -3114,15 +3017,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3137,17 +3038,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3168,12 +3066,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Nòtas"
@@ -3186,8 +3081,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3212,21 +3106,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Còde"
 
@@ -3236,8 +3124,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Pas cap"
@@ -3264,8 +3151,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nom de la taxa"
@@ -3342,8 +3228,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3356,8 +3241,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3394,8 +3278,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Crear"
@@ -3411,8 +3294,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Acorchi"
 
@@ -3437,15 +3319,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3481,8 +3361,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3558,8 +3437,7 @@ msgid "Journal code"
 msgstr "Jornal"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3615,14 +3493,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sequéncia"
@@ -3688,8 +3563,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3709,8 +3583,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data de començament"
@@ -3748,8 +3621,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Nòta"
 
@@ -3773,8 +3645,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3895,12 +3766,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Actiu"
@@ -3952,20 +3820,15 @@ msgid "Secondary Currency"
 msgstr "Devisa"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3996,8 +3859,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4089,18 +3951,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4113,8 +3972,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4141,8 +3999,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4193,12 +4050,10 @@ msgid "Type Controls"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,name:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nom del compte"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4206,9 +4061,10 @@ msgid "Payment date"
 msgstr ""
 
 #. module: account
-#: wizard_button:account_use_models,create,end:0
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "D'acòrdi"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4287,8 +4143,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4314,14 +4169,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4342,8 +4195,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4361,8 +4213,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4422,14 +4273,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4465,8 +4314,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4583,11 +4431,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4682,12 +4528,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4764,8 +4607,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4792,8 +4634,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4804,8 +4645,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4821,8 +4661,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4837,8 +4676,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4856,8 +4694,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4867,25 +4704,10 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
-#: field:account.analytic.account,debit:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
-#: field:report.hr.timesheet.invoice.journal,revenue:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Debit"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
@@ -4944,8 +4766,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4976,8 +4797,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5027,14 +4847,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5075,8 +4893,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5101,9 +4918,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5120,8 +4935,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5172,8 +4986,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5219,12 +5032,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5251,8 +5061,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5288,22 +5097,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5319,8 +5122,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5343,8 +5145,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5388,8 +5189,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5400,24 +5200,10 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
-#: selection:account.account.type,close_method:0
-#: field:account.analytic.account,balance:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Balança"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5458,11 +5244,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5501,8 +5284,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5595,15 +5377,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5647,8 +5425,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5729,11 +5506,9 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Liquiditats"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5771,8 +5546,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5819,10 +5593,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5856,10 +5628,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5916,8 +5686,7 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5925,6 +5694,199 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
-#, python-format
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Totes los comptes"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificacion"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periòde Fiscal"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balança dels comptes"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Afichar los Comptes"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data de creacion"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
 #~ msgid "Integrity Error !"
 #~ msgstr "Error d'Integritat !"
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 752adf9313f..a7d6841ad73 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Zapisy nieuzgodnione"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Kod bazowy"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Pozostało"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Wybór pozycji zapisów"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Etykieta zapisu"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Suma okresu"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Oblicz kod (jeśli typ = kod)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Pozycje zapisów"
 
@@ -232,12 +226,9 @@ msgstr "Zapisy rekurencyjne"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Kwota"
@@ -278,8 +269,7 @@ msgstr ""
 "szybszego wprowadzania w każdym dzienniku."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -293,14 +283,12 @@ msgstr ""
 "teraz i 50% w ciągu miesiąca."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Stały"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Płatności przeterminowane"
 
@@ -316,8 +304,7 @@ msgid "Select period"
 msgstr "Wybierz okres"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Pochodzenie"
 
@@ -347,8 +334,7 @@ msgid "Delta Debit"
 msgstr "Przyrost Winien"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Podatek"
@@ -367,14 +353,12 @@ msgid "Analytic Account"
 msgstr "Konto analityczne"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Podatek na podrzędnych"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nazwa dziennika"
@@ -442,11 +426,8 @@ msgid "Contra"
 msgstr "Przeciwny"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Stan"
@@ -458,8 +439,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Niezapłacone korekty od dostawcy"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Specjalne Obliczenie"
 
@@ -481,10 +461,8 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Odnośnik"
@@ -681,8 +659,7 @@ msgid "Sub-Total :"
 msgstr "Suma częściowa :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -714,8 +691,7 @@ msgid "Select the Period for Analysis"
 msgstr "Wybierz okres do analizy"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -747,8 +723,7 @@ msgid "Field Name"
 msgstr "Nazwa pola"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Znak dla nadrzędnego"
 
@@ -758,8 +733,7 @@ msgid "End of Year Entries Journal"
 msgstr "Dziennik zapisów końca roku"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Właściwości zakupu"
 
@@ -779,12 +753,9 @@ msgid "Move Lines Created."
 msgstr "Utworzono pozycje zapisów."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Stan"
 
@@ -941,10 +912,8 @@ msgstr "Wybierz plan kont"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Ilość"
@@ -987,16 +956,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1018,8 +984,7 @@ msgid "Net Total:"
 msgstr "Suma netto:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1143,8 +1108,7 @@ msgid "Fiscal Position Templates"
 msgstr "Szablony obszarów podatkowych"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena jedn."
 
@@ -1302,8 +1266,7 @@ msgid "Not reconciled transactions"
 msgstr "Nie uzgodnione transakcje"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapowanie podatków"
@@ -1325,8 +1288,7 @@ msgid "Write-Off account"
 msgstr "Konto odpisów"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1352,11 +1314,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Wybierz faktury, które chcesz opłacić i zarządać zaliczkami"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Widok"
 
@@ -1425,8 +1385,7 @@ msgstr "Typy kont"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1442,8 +1401,7 @@ msgid "Journal"
 msgstr "Dziennik"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Konta podrzędne"
 
@@ -1469,8 +1427,7 @@ msgid "Statement reconcile line"
 msgstr "Pozycja uzgodnienia wyciągu"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Pozostaw puste, aby stosować konto dochodowe"
 
@@ -1599,8 +1556,7 @@ msgid "Account n°"
 msgstr "Nr konta"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Zostaw puste żeby używać konta kosztowego"
 
@@ -1610,8 +1566,7 @@ msgid "Account to reconcile"
 msgstr "Konto do uzgodnienia"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Odn. partnera"
@@ -1623,14 +1578,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Konta należności i zobowiązań"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Pozycje subskrypcji"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1794,8 +1747,7 @@ msgid "Period length (days)"
 msgstr "Długość okresu (w dniach)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procentowo"
@@ -1806,8 +1758,7 @@ msgid "Charts"
 msgstr "Plany kont"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1881,12 +1832,9 @@ msgstr "x Dziennik korekt wydatków"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Typ"
 
@@ -2034,8 +1982,7 @@ msgid "Journal-Period Name"
 msgstr "Dziennik - nazwa okresu"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nazwa rejestru"
 
@@ -2053,8 +2000,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2127,10 +2073,8 @@ msgstr "Przeszłość"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Waluta"
@@ -2168,8 +2112,7 @@ msgid "Analytic Entry"
 msgstr "Zapis analityczny"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Komunikat przeterminowanych płatności"
 
@@ -2221,8 +2164,7 @@ msgid "Detail"
 msgstr "Szczegół"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidacja"
 
@@ -2319,21 +2261,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Konto podstawy do deklaracji podatkowej"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2350,8 +2287,7 @@ msgid "Unreconcile"
 msgstr "Skasuj uzgodnienie"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Typ podatku"
 
@@ -2361,8 +2297,7 @@ msgid "Statement Entries"
 msgstr "Zapisy wyciągu"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
@@ -2452,8 +2387,7 @@ msgid "Date End"
 msgstr "Data końcowa"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2461,8 +2395,7 @@ msgid "Entry Lines"
 msgstr "Pozycje zapisu"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Właściwy kod (jeśli typ = kod)"
 
@@ -2487,8 +2420,7 @@ msgstr "Wprowadzanie zapisów wg pozycji"
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
-"Lista wszystkich podatków, które mają być zainstalowane przez kreatora"
+msgstr "Lista wszystkich podatków, które mają być zainstalowane przez kreatora"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2552,11 +2484,9 @@ msgstr "Z analitycznych kont, Utwórz fakturę."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2575,8 +2505,7 @@ msgstr "Z analitycznych kont, Utwórz fakturę."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -2586,10 +2515,8 @@ msgid "Acc. Type Name"
 msgstr "Nazwa typu konta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2603,8 +2530,7 @@ msgid "Litigation"
 msgstr "Spór sądowy"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informacja"
@@ -2716,8 +2642,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2784,17 +2709,13 @@ msgid "Invoice Reference"
 msgstr "Odnośnik faktury"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nazwa"
@@ -2837,8 +2758,7 @@ msgstr ""
 "wieloma podrzędnymi. W takim przypadku kolejność obliczeń ma znaczenie."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2931,16 +2851,11 @@ msgid "Full Account Name"
 msgstr "Pełna nazwa konta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2961,9 +2876,7 @@ msgid "Document: Customer account statement"
 msgstr "Dokument: Zestawienie kont klienta"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Księgowość"
 
@@ -3008,10 +2921,8 @@ msgid "Centralisation"
 msgstr "Centralizacja"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Kod podatku"
@@ -3054,14 +2965,12 @@ msgstr ""
 "warunków płatności partnera."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Sytuacja"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3101,8 +3010,7 @@ msgid "Cancel selected invoices"
 msgstr "Anuluj zaznaczone faktury"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3125,28 +3033,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Ustaw na projekt"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Oznaczenie dokumentu, z którego utworzono tę fakturę."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Zobowiązania"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Baza"
 
@@ -3156,8 +3059,7 @@ msgid "Model Name"
 msgstr "Nazwa modelu"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Inne"
 
@@ -3167,15 +3069,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Zatwierdź"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3190,17 +3090,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3221,12 +3118,9 @@ msgid "By Date and Period"
 msgstr "Wg daty i okresu"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Uwagi"
@@ -3239,8 +3133,7 @@ msgid ""
 msgstr "Zapisy konta dla faktury zostały uzgodnione z zapisami płatności."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3265,21 +3158,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Wprowadzenie wyciągu generuje zapisy płatności"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kod"
 
@@ -3289,8 +3176,7 @@ msgid "Financial Management"
 msgstr "Księgowość"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Brak"
@@ -3317,8 +3203,7 @@ msgid "Additionnal Information"
 msgstr "Dodatkowe informacje"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nazwa podatku"
@@ -3395,8 +3280,7 @@ msgid "Partner Balance"
 msgstr "Saldo partnera"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3411,8 +3295,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3451,8 +3334,7 @@ msgid "Import invoice"
 msgstr "Importuj fakturę"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Utwórz"
@@ -3468,8 +3350,7 @@ msgid "Invoice line"
 msgstr "Pozycja faktury"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Skrót"
 
@@ -3496,15 +3377,13 @@ msgid ""
 msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Nadrzędne konto podatkowe"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3540,8 +3419,7 @@ msgid "Central Journal"
 msgstr "Konta dziennika"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo z przeniesienia"
 
@@ -3617,8 +3495,7 @@ msgid "Journal code"
 msgstr "Kod dziennika"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Utwórz zapisy"
 
@@ -3677,14 +3554,11 @@ msgstr ""
 "podatkowym pojawił się na fakturach."
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Numeracja"
@@ -3752,8 +3626,7 @@ msgstr "Konto subskrypcji"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data zapłaty"
 
@@ -3773,8 +3646,7 @@ msgid "Account Configure Wizard "
 msgstr "Kreator konfiguracji konta "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data początkowa"
@@ -3812,8 +3684,7 @@ msgid "Unreconciled"
 msgstr "Skasowano uzgodnienie"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Uwaga"
 
@@ -3846,8 +3717,7 @@ msgid "Entry Sequence"
 msgstr "Numeracja zapisów"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Zamknięte"
 
@@ -3975,12 +3845,9 @@ msgid "Code/Date"
 msgstr "Kod/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktywne"
@@ -4032,20 +3899,15 @@ msgid "Secondary Currency"
 msgstr "Waluta dodatkowa"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4078,8 +3940,7 @@ msgid "Account Move"
 msgstr "Zapis konta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Pozycje wyciągu"
 
@@ -4176,18 +4037,15 @@ msgid "Journal Column"
 msgstr "Kolumna dziennika"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4200,8 +4058,7 @@ msgid "Periods"
 msgstr "Okresy"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4228,8 +4085,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Domyślne podatki"
 
@@ -4288,8 +4144,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nazwa konta"
 
@@ -4380,8 +4235,7 @@ msgid "Import file from your bank statement"
 msgstr "Importuj plik wyciągu bankowego"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Typ wewnętrzny"
 
@@ -4407,14 +4261,12 @@ msgid "Posted"
 msgstr "Zaksięgowano"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Nota kredytowa"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data końcowa"
 
@@ -4435,8 +4287,7 @@ msgid "Day of the Month"
 msgstr "Dzień miesiąca"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Pozycje"
 
@@ -4458,8 +4309,7 @@ msgstr ""
 "obliczania."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Deklaracja podatkowa"
 
@@ -4519,14 +4369,12 @@ msgid "The optional quantity on entries"
 msgstr "Opcjonalne ilości na zapisach"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Stany"
 
@@ -4562,8 +4410,7 @@ msgstr "Data rozpoczęcia"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Suma"
 
@@ -4682,11 +4529,9 @@ msgstr "Ważne zapisy z faktury"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4783,12 +4628,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Drukuj bilans próbny wiekowania"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Odn."
 
@@ -4868,8 +4710,7 @@ msgid "Control Invoice"
 msgstr "Sprawdź fakturę"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Należności"
@@ -4896,8 +4737,7 @@ msgstr "VAT:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Suma:"
@@ -4908,8 +4748,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapowanie konta"
@@ -4925,8 +4764,7 @@ msgid "Account Reconciliation"
 msgstr "Uzgodnienie konta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -4941,8 +4779,7 @@ msgid "Parent Account Template"
 msgstr "Szablon konta nadrzędnego"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4962,8 +4799,7 @@ msgid "Analytic account"
 msgstr "Konto analityczne"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Faktura od dostawcy"
 
@@ -4973,22 +4809,16 @@ msgid "Valid"
 msgstr "Ważna"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Winien"
@@ -5050,8 +4880,7 @@ msgid "Reporting"
 msgstr "Raportowanie"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -5082,8 +4911,7 @@ msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Suma kwot"
 
@@ -5133,14 +4961,12 @@ msgid "Paid invoice"
 msgstr "Faktura zapłacona"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definicja podatku"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupa podatku"
 
@@ -5183,8 +5009,7 @@ msgid "With movements"
 msgstr "Ze zmianami stanu"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domena"
 
@@ -5209,9 +5034,7 @@ msgid "Manually"
 msgstr "Ręcznie"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5228,8 +5051,7 @@ msgid "Payable Accounts"
 msgstr "Konta zobowiązań"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Pozycja faktury"
 
@@ -5280,8 +5102,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Ewnetualna druga waluta jeśli ten zapis jest wielowalutowy."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Płatności"
@@ -5327,12 +5148,9 @@ msgstr "Wybierz dziennik i datę płatności"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Projekt"
@@ -5359,8 +5177,7 @@ msgid "Are you sure ?"
 msgstr "Na pewno?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5396,22 +5213,16 @@ msgid "Supplier Invoice Process"
 msgstr "Proces faktury dostawcy"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Strona"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informacje dodatkowe"
 
@@ -5427,8 +5238,7 @@ msgid "Receivable and Payable"
 msgstr "Należności i zobowiązania"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5451,8 +5261,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Oblicz"
@@ -5496,8 +5305,7 @@ msgid "End of period"
 msgstr "Koniec okresu"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Zapis na koncie"
 
@@ -5508,8 +5316,7 @@ msgid "General Journal"
 msgstr "Stany dzienników"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5517,12 +5324,9 @@ msgstr "Stany dzienników"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5568,11 +5372,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Numeracja stosowana dla numerów faktur w tym dzienniku"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informacje ogólne"
 
@@ -5614,8 +5415,7 @@ msgid "List of Accounts"
 msgstr "Lista kont"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Właściwości sprzedaży"
 
@@ -5708,15 +5508,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Opis"
 
@@ -5764,8 +5560,7 @@ msgstr ""
 "tego partnera"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Kod rejestru"
 
@@ -5846,11 +5641,9 @@ msgid "Models Definition"
 msgstr "Definicje modeli"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Gotówka"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5888,8 +5681,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
@@ -5936,10 +5728,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5973,10 +5763,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nazwa roku podatkowego wyświetlana na ekranie"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6034,8 +5822,7 @@ msgstr "Tak"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Zaznacz tę opcję, jeśli chcesz, aby użytkownik miał prawo uzgadniać zapisy "
 "tego konta."
@@ -6044,3 +5831,336 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Oblicz daty zapisów"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Konta analityczne do zamknięcia"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Projekty faktur"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Konsola księgowości"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Konta do faktur"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Koszty do faktur"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Przeterminowane wierzytelności"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Konsola dla księgowści"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Konta przychodowe"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Moje wskaźniki"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Konsola kont"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Przeterminowany dochód"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Pokaż informację Winien/Ma"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Wszystkie konta"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Wybór zapisów wg"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Powiadamianie"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Okres finansowy"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo konta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Wybierz okres(y)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Procentowo"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Porównaj wybrane lata pod kątem"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Wybierz lata podatkowe (maksymalnie 3)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Wybierz konto referencyjne (do porównania %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Saldo konta - Porównanie lat"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Musisz wybrać opcję 'Poziomo'. Zaznacz ją."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Pokaż raport w poziomie"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Pokaż porównanie w %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Wybierz okres"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opcje raportu"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Nie porównuj"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Pokaż konta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Wybrałeś więcej niż 3 lata w którymś przypadku."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Możesz wybrać maksymalnie 3 lata. Sprawdź ponownie."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Wybrałeś opcję 'Procentowo' z więcej niż dwoma latami, ale nie wybrałeś "
+"wydruku poziomego."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Mogłaś(eś) popełnić jeden z poniższych błędów. Popraw i spróbuj ponownie."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Pozostaw puste do porównania z nadrzędnymi."
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data utworzenia"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr "2. Nie wybrałeś opcji 'Procentowo', ale wybrałeś więcej niż 2 lata."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Pewnie wybrałaś(eś) opcję porównania z więcej niż 1 rokiem z kolumnami "
+"Winien/Ma i opcją %. To prowadzi do wydruku poza papierem. Spróbuj ponownie."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Musisz wybrać co najmniej 1 rok podatkowy. Spróbuj ponownie."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Dostosuj raport"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Suma kwot"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Konta wg typu"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Konta należności"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Zakres"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Moduł dodający nowe raporty dla księgowości"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Kisęgowość - Raportowanie"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Bilans wg typów kont"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Tydzień roku"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Przeterminowane należności"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Kwota bez podatku"
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 952c4681228..cfc2e9e561c 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -79,8 +79,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
-"Mantenha vazio para usar o período da data de validação (da factura)."
+msgstr "Mantenha vazio para usar o período da data de validação (da factura)."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -93,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Movimentos por reconciliar"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Código Base"
@@ -126,8 +124,7 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -191,10 +188,8 @@ msgid "Move line select"
 msgstr "Seleccionar linhas de movimento"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Descrição do movimento"
 
@@ -209,14 +204,12 @@ msgid "Period Sum"
 msgstr "Acumulado do período"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Processar código (se tipo=código)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Linha de movimento de conta"
 
@@ -233,12 +226,9 @@ msgstr "Movimentos recorrentes"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Montante"
@@ -279,8 +269,7 @@ msgstr ""
 "dos movimentos no diário."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -293,14 +282,12 @@ msgstr ""
 "várias datas de vendimento- ex: 50% a pronto e 50% a 30 dias."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Pagamentos expirado"
 
@@ -316,8 +303,7 @@ msgid "Select period"
 msgstr "Escolha o período"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origem"
 
@@ -347,8 +333,7 @@ msgid "Delta Debit"
 msgstr "Debito delta"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Imposto"
@@ -367,14 +352,12 @@ msgid "Analytic Account"
 msgstr "Conta analítica"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Imposto nos dependentes"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nome do diário"
@@ -442,11 +425,8 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estado"
@@ -458,8 +438,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Reembolso do fornecedor não pago"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Cálculo especial"
 
@@ -481,10 +460,8 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -679,8 +656,7 @@ msgid "Sub-Total :"
 msgstr "Sub-total :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -712,8 +688,7 @@ msgid "Select the Period for Analysis"
 msgstr "Seleccione o período para análise."
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -745,8 +720,7 @@ msgid "Field Name"
 msgstr "Nome do Campo"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Sinal do ascendente"
 
@@ -756,8 +730,7 @@ msgid "End of Year Entries Journal"
 msgstr "Diários de fim de exercício"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propriedades das compras."
 
@@ -777,12 +750,9 @@ msgid "Move Lines Created."
 msgstr "Mover as linhas criadas."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Estado"
 
@@ -939,10 +909,8 @@ msgstr "Seleccionar gráfico de contas"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantidade"
@@ -985,16 +953,13 @@ msgstr "Factura analítica"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1016,8 +981,7 @@ msgid "Net Total:"
 msgstr "Neto total:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1141,8 +1105,7 @@ msgid "Fiscal Position Templates"
 msgstr "Modelos de posição fiscal"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preço Unitário"
 
@@ -1300,8 +1263,7 @@ msgid "Not reconciled transactions"
 msgstr "Transacções não reconciliadas"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapeamento do Imposto"
@@ -1323,8 +1285,7 @@ msgid "Write-Off account"
 msgstr "Fechar conta"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelo"
 
@@ -1350,11 +1311,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Seleccione as facturas que quer pagar e gerir adiantamentos."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Ecrã"
 
@@ -1425,8 +1384,7 @@ msgstr "Tipos de conta"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1442,8 +1400,7 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Conta-filha"
 
@@ -1469,8 +1426,7 @@ msgid "Statement reconcile line"
 msgstr "Linhas de declaração reconciliada"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Manter vazia para usar a conta a chegar"
 
@@ -1599,8 +1555,7 @@ msgid "Account n°"
 msgstr "Conta nº"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Deixe em branco para usar a conta de custos"
 
@@ -1610,8 +1565,7 @@ msgid "Account to reconcile"
 msgstr "Conta a reconciliar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Ref. do Parceiro"
@@ -1623,14 +1577,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Contas a receber e a pagar"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Linhas de Subscrição"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1794,8 +1746,7 @@ msgid "Period length (days)"
 msgstr "Período de duração (dias)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentagem"
@@ -1806,8 +1757,7 @@ msgid "Charts"
 msgstr "Gráficos"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1882,12 +1832,9 @@ msgstr "x Diário de notas do crédito de gastos"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2035,8 +1982,7 @@ msgid "Journal-Period Name"
 msgstr "Nome do periodo de diário"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nome do caso de imposto"
 
@@ -2053,8 +1999,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2128,10 +2073,8 @@ msgstr "Passado"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Moeda"
@@ -2169,8 +2112,7 @@ msgid "Analytic Entry"
 msgstr "movimento analitico"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensagem de pagamentos em atraso"
 
@@ -2222,8 +2164,7 @@ msgid "Detail"
 msgstr "Detalhe"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidação"
 
@@ -2320,21 +2261,16 @@ msgid "The account basis of the tax declaration."
 msgstr "A contas base da declaração fiscal"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2351,8 +2287,7 @@ msgid "Unreconcile"
 msgstr "Des-reconciliar"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tipo de imposto"
 
@@ -2362,8 +2297,7 @@ msgid "Statement Entries"
 msgstr "Movimentos do extracto"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
@@ -2453,8 +2387,7 @@ msgid "Date End"
 msgstr "Data Final"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2462,8 +2395,7 @@ msgid "Entry Lines"
 msgstr "Linhas de movimento"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Código Aplicavel (se tipo=código)"
 
@@ -2488,8 +2420,7 @@ msgstr "Introdução de movimentos por linha"
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
-"Lista de todos os impostos que têm de ser instalados pelo assistentes"
+msgstr "Lista de todos os impostos que têm de ser instalados pelo assistentes"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2553,11 +2484,9 @@ msgstr "De contas analíticas, criar factura."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2576,8 +2505,7 @@ msgstr "De contas analíticas, criar factura."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2587,10 +2515,8 @@ msgid "Acc. Type Name"
 msgstr "Nome do tipo de conta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2604,8 +2530,7 @@ msgid "Litigation"
 msgstr "Litígio"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informação"
@@ -2644,8 +2569,7 @@ msgstr "Ordem de pagamento"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr ""
-"Assinale esta opção para poder reconciliar os movimentos desta conta."
+msgstr "Assinale esta opção para poder reconciliar os movimentos desta conta."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2692,8 +2616,8 @@ msgstr ""
 "Este tipo é usado para diferenciar tipos com efeitos particulares no "
 "OpenERP: \"vista\" não pode receber movimentos (conta intermédia); "
 "\"consolidação\" são contas que têm dependentes para consolidação multi-"
-"companhia; \"a pagar\"/\"a receber\" são contas de parceiros; \"bloqueada\" -"
-" conta sque deixaram de ser usadas."
+"companhia; \"a pagar\"/\"a receber\" são contas de parceiros; \"bloqueada\" "
+"- conta sque deixaram de ser usadas."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2721,8 +2645,7 @@ msgid "Price"
 msgstr "Preço"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2789,17 +2712,13 @@ msgid "Invoice Reference"
 msgstr "Referencia da factura"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2842,8 +2761,7 @@ msgstr ""
 "avaliação dos dependentes tem consequências no valor final."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2936,16 +2854,11 @@ msgid "Full Account Name"
 msgstr "Nome completo da conta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2966,9 +2879,7 @@ msgid "Document: Customer account statement"
 msgstr "Documento: Extracto de conta de cliente"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Contabilidade"
 
@@ -3013,10 +2924,8 @@ msgid "Centralisation"
 msgstr "Centralização"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Código do imposto"
@@ -3059,14 +2968,12 @@ msgstr ""
 "do parceiro."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situação"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3106,8 +3013,7 @@ msgid "Cancel selected invoices"
 msgstr "Cancelar facturas seleccionadas"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3130,28 +3036,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Definido como rascunho"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referencia do documento que produziu esta factura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Pagável"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base"
 
@@ -3161,8 +3062,7 @@ msgid "Model Name"
 msgstr "Nome do modelo"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Outros"
 
@@ -3172,15 +3072,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3195,17 +3093,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3226,12 +3121,9 @@ msgid "By Date and Period"
 msgstr "Por data e período"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notas"
@@ -3246,8 +3138,7 @@ msgstr ""
 "do pagamento."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3272,21 +3163,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "O registo do extracto gera movimentos de pagamento"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Código"
 
@@ -3296,8 +3181,7 @@ msgid "Financial Management"
 msgstr "Gestão financeira"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nenhum(a)"
@@ -3324,8 +3208,7 @@ msgid "Additionnal Information"
 msgstr "Informação adicional"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nome do imposto"
@@ -3402,8 +3285,7 @@ msgid "Partner Balance"
 msgstr "saldo do parceiro"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Balancete de terceiros"
 
@@ -3418,8 +3300,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3458,8 +3339,7 @@ msgid "Import invoice"
 msgstr "Importar factura"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Criar"
@@ -3475,8 +3355,7 @@ msgid "Invoice line"
 msgstr "Linha de factura"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -3503,15 +3382,13 @@ msgid ""
 msgstr "O valor expresso em divisas, se é um movimento em moeda estrangeira."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Conta de imposto Pai"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3547,8 +3424,7 @@ msgid "Central Journal"
 msgstr "Diário central"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo transitado"
 
@@ -3624,8 +3500,7 @@ msgid "Journal code"
 msgstr "Código do diário"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Criar movimentos"
 
@@ -3685,14 +3560,11 @@ msgstr ""
 "apareça nas facturas"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sequência"
@@ -3760,8 +3632,7 @@ msgstr "Subscrição da conta"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Dada de maturidade"
 
@@ -3781,8 +3652,7 @@ msgid "Account Configure Wizard "
 msgstr "Assistente de configuração de contas "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data de Início"
@@ -3820,8 +3690,7 @@ msgid "Unreconciled"
 msgstr "Desreconciliado"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Nota"
 
@@ -3854,8 +3723,7 @@ msgid "Entry Sequence"
 msgstr "Sequencia de movimentos"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Fechado"
 
@@ -3984,12 +3852,9 @@ msgid "Code/Date"
 msgstr "Código/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Activo"
@@ -4041,20 +3906,15 @@ msgid "Secondary Currency"
 msgstr "Moeda secundaria"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4087,8 +3947,7 @@ msgid "Account Move"
 msgstr "Movimentos da Contabilidade"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Linhas declaração"
 
@@ -4185,18 +4044,15 @@ msgid "Journal Column"
 msgstr "Coluna do diário"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Concluído"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4209,8 +4065,7 @@ msgid "Periods"
 msgstr "Períodos"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4237,8 +4092,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Custos analíticos para refacturar compras, folhas de trabalhos, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Impostos padrão"
 
@@ -4296,8 +4150,7 @@ msgstr "Controlos de tipo"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nome da conta"
 
@@ -4388,8 +4241,7 @@ msgid "Import file from your bank statement"
 msgstr "Importar ficheiro da tua declaração bancaria"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tipo interno"
 
@@ -4415,14 +4267,12 @@ msgid "Posted"
 msgstr "Publicado"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Notas de crédito"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data final"
 
@@ -4443,8 +4293,7 @@ msgid "Day of the Month"
 msgstr "Dia do mês"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Linhas"
 
@@ -4465,8 +4314,7 @@ msgstr ""
 "avaliação dos dependentes vai determinar o resultado final."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaração de impostos"
 
@@ -4526,14 +4374,12 @@ msgid "The optional quantity on entries"
 msgstr "A quantidade optconal nos movimentos"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Estados"
 
@@ -4569,8 +4415,7 @@ msgstr "Data de inicio"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4689,11 +4534,9 @@ msgstr "Movimentos válidos de facturas"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4790,12 +4633,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimir balancete de antiguidade de saldos"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Referencia"
 
@@ -4875,8 +4715,7 @@ msgid "Control Invoice"
 msgstr "Controle de factura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "A receber"
@@ -4903,8 +4742,7 @@ msgstr "IVA:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4915,8 +4753,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapeamento das contas"
@@ -4932,8 +4769,7 @@ msgid "Account Reconciliation"
 msgstr "Reconciliação da conta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4948,8 +4784,7 @@ msgid "Parent Account Template"
 msgstr "Modelo de conta ascendente"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4970,8 +4805,7 @@ msgid "Analytic account"
 msgstr "Conta da contabilidade analítica"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Factura do fornecedor"
 
@@ -4981,22 +4815,16 @@ msgid "Valid"
 msgstr "Válido"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Débito"
@@ -5058,8 +4886,7 @@ msgid "Reporting"
 msgstr "Relatório"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5090,8 +4917,7 @@ msgid "Configuration"
 msgstr "Configuração"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Montante Total"
 
@@ -5142,14 +4968,12 @@ msgid "Paid invoice"
 msgstr "Factura paga"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Difinição do imposto"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupo de impostos"
 
@@ -5192,8 +5016,7 @@ msgid "With movements"
 msgstr "Com movimentos"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domínio"
 
@@ -5218,9 +5041,7 @@ msgid "Manually"
 msgstr "Manualmente"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5237,8 +5058,7 @@ msgid "Payable Accounts"
 msgstr "Contas a pagar"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Linha de Factura"
 
@@ -5289,8 +5109,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "A outra divisa (opcional) se é um movimento multi-divisa."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Pagamentos"
@@ -5336,12 +5155,9 @@ msgstr "Escolha o diário e a data de pagamento"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Rascunho"
@@ -5368,8 +5184,7 @@ msgid "Are you sure ?"
 msgstr "Tem a certeza?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
@@ -5405,22 +5220,16 @@ msgid "Supplier Invoice Process"
 msgstr "Processo das facturas de fornecedores"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informação Opcional"
 
@@ -5436,8 +5245,7 @@ msgid "Receivable and Payable"
 msgstr "A receber e a pagar"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5463,8 +5271,7 @@ msgstr ""
 "incidência do imposto."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calcular"
@@ -5508,8 +5315,7 @@ msgid "End of period"
 msgstr "Fim do período"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Movimento contabilístico"
 
@@ -5520,8 +5326,7 @@ msgid "General Journal"
 msgstr "Diário geral"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5529,12 +5334,9 @@ msgstr "Diário geral"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5580,11 +5382,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "A sequência de numeração das facturas deste diário"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informação geral"
 
@@ -5625,8 +5424,7 @@ msgid "List of Accounts"
 msgstr "Lista de contas"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Propriedades da venda"
 
@@ -5719,15 +5517,11 @@ msgstr "intraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -5775,8 +5569,7 @@ msgstr ""
 "parceiro actual"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Código do caso"
 
@@ -5858,8 +5651,7 @@ msgstr "Definições do modelo"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Dinheiro"
 
@@ -5899,8 +5691,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Manter vazio para todos os anos fiscais abertos"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Reembolso do fornecedor"
 
@@ -5949,10 +5740,8 @@ msgstr ""
 "de artigos actual"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5986,10 +5775,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nome do ano fiscal como mostrado no ecrã."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6048,11 +5835,348 @@ msgstr "Sim"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr "Assinale se é permitido reconciliar os movimentos desta conta."
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calcular datas do movimentos"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Contas da contabilidade analítica para fechar"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Rascunho de facturas"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Painel da contabilidade"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Contas a facturar"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Custos a facturar"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "A receber ente datas"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Contas de Receitas"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Meus indicadores"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Quadro de conta"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Renda envelhecida"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostrar informação de debito / credito"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas as Contas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selecções de entradas baseadas em"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificação"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Período Financeiro"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo de conta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Selecçionar periodos"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Percentagem"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparar ano selecçionados em termos de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Seleccione o(s) ano(s) fiscais (no máximo três anos)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selecçione conta de referençia (por % de comparção)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Balancete de contas - comparar anos"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Você tem de seleccionar a opção 'Landscape'. Por favor verifique-o."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar relatório em modo de paisagem"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparação em %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selecionar período"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opções de relatório"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Não comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar contas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "Selecçionaste mais de 3 anos em qualquer caso."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Ano :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Você pode seleccionar no máximo de 3 anos. por favor verifique de novo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Você seleccionou a opção 'Percentagem' com mais de 2 anos, mas você não "
+"seleccionou o formato Landscape"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Você pode ter cometido os seguintes erros. Por favor corrija-os e tente de "
+"novo."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Manter vazio para comparação com o seu ascendente"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. Você não seleccionou a opção 'Percentagem', mas você seleccionou mais de "
+"2 anos"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Você pode ter seleccionado as opções de comparação com mais de 1 ano com as "
+"colunas do crédito/débito e os % da opção. Isto pode levar a que os "
+"conteúdos sejam  imprimidos para fora do papel. Por favor tente outra vez."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Você tem de seleccionar pelo menos 1 ano fiscal. Tente de novo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Personalizar relatório"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Contas por tipo"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Contas que se pode receber"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Saldo por tipo de conta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana do ano"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 2ea41649a35..5a82c6d0513 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Lançamentos não reconciliados"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Código base"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Residual"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Mover a linha selecionada"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Etiqueta de lançamento"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Soma do período"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Computar Código (se tipo=código)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Linha de lançamento de conta"
 
@@ -232,12 +226,9 @@ msgstr "Lançamentos recorrentes"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Montante"
@@ -278,8 +269,7 @@ msgstr ""
 "codificação mais rápida em cada diário."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -293,14 +283,12 @@ msgstr ""
 "exemplo 30/60/90 dias da data."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fixo"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Pagamentos atrasados"
 
@@ -316,8 +304,7 @@ msgid "Select period"
 msgstr "Selecione o período"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origem"
 
@@ -347,8 +334,7 @@ msgid "Delta Debit"
 msgstr "Diferença de Débito"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Imposto"
@@ -367,14 +353,12 @@ msgid "Analytic Account"
 msgstr "Conta analítica"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Imposto nas sub-contas"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nome do diário"
@@ -442,11 +426,8 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Estado"
@@ -458,8 +439,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Reembolsos a fornecedores não pagos"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Cálculo especial"
 
@@ -482,10 +462,8 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -682,8 +660,7 @@ msgid "Sub-Total :"
 msgstr "Subtotal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -715,8 +692,7 @@ msgid "Select the Period for Analysis"
 msgstr "Selecione o Período para Análise"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -748,8 +724,7 @@ msgid "Field Name"
 msgstr "Nome do Campo"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Sinal para conta-pai"
 
@@ -759,8 +734,7 @@ msgid "End of Year Entries Journal"
 msgstr "Diário de lançamentos do fim do ano"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Propriedades da Compra"
 
@@ -780,12 +754,9 @@ msgid "Move Lines Created."
 msgstr "Foram criadas linhas de movimento"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Posição"
 
@@ -942,10 +913,8 @@ msgstr "Selecionar plano de contas"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Quantidade"
@@ -988,16 +957,13 @@ msgstr "Fatura analítica"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1019,8 +985,7 @@ msgid "Net Total:"
 msgstr "Total líquido:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1144,8 +1109,7 @@ msgid "Fiscal Position Templates"
 msgstr "Modelo de posição fiscal"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preço unitário"
 
@@ -1303,8 +1267,7 @@ msgid "Not reconciled transactions"
 msgstr "Transação não conciliada"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Mapeamento de Impostos"
@@ -1326,8 +1289,7 @@ msgid "Write-Off account"
 msgstr "Conta de amortização"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modelo"
 
@@ -1353,11 +1315,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Visualizar"
 
@@ -1429,8 +1389,7 @@ msgstr "Tipos de Conta"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1446,8 +1405,7 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Sub-contas"
 
@@ -1473,8 +1431,7 @@ msgid "Statement reconcile line"
 msgstr "Linha de reconciliação do Demonstrativo"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Manter vazio para usar a conta de receita"
 
@@ -1603,8 +1560,7 @@ msgid "Account n°"
 msgstr "Conta n°"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Deixe vazio para usar a conta de despesas"
 
@@ -1614,8 +1570,7 @@ msgid "Account to reconcile"
 msgstr "Conta a reconciliar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Código parceiro"
@@ -1627,14 +1582,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Contas a Pagar e Receber"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Linhas de inscrição"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1798,8 +1751,7 @@ msgid "Period length (days)"
 msgstr "Duração do Período (dias)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Percentual"
@@ -1810,8 +1762,7 @@ msgid "Charts"
 msgstr "Planos"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1887,12 +1838,9 @@ msgstr "x Diário de Notas de Crédito gastas"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2040,8 +1988,7 @@ msgid "Journal-Period Name"
 msgstr "Diário-Nome do período"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nome do caso da taxa"
 
@@ -2059,8 +2006,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2134,10 +2080,8 @@ msgstr "Passado"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Moeda"
@@ -2175,8 +2119,7 @@ msgid "Analytic Entry"
 msgstr "Lançamento analítico"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensagem para Pagamentos Atrasados"
 
@@ -2228,8 +2171,7 @@ msgid "Detail"
 msgstr "Detalhe"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidação"
 
@@ -2326,21 +2268,16 @@ msgid "The account basis of the tax declaration."
 msgstr "A base contábil da declaração de imposto."
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2357,8 +2294,7 @@ msgid "Unreconcile"
 msgstr "Não concilidado"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tipo de taxa"
 
@@ -2368,8 +2304,7 @@ msgid "Statement Entries"
 msgstr "Lançamentos do Demonstrativo"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Usuário"
 
@@ -2459,8 +2394,7 @@ msgid "Date End"
 msgstr "Data de término"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2468,8 +2402,7 @@ msgid "Entry Lines"
 msgstr "Linhas de lançamentos"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Código aplicável (se tipo=código)"
 
@@ -2558,11 +2491,9 @@ msgstr "De contas analíticas, criar fatura."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2581,8 +2512,7 @@ msgstr "De contas analíticas, criar fatura."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2592,10 +2522,8 @@ msgid "Acc. Type Name"
 msgstr "Nome Tipo de Conta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2609,8 +2537,7 @@ msgid "Litigation"
 msgstr "Litígio"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informação"
@@ -2727,8 +2654,7 @@ msgid "Price"
 msgstr "Preço"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2795,17 +2721,13 @@ msgid "Invoice Reference"
 msgstr "Referencia fatura"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nome"
@@ -2848,8 +2770,7 @@ msgstr ""
 "dependentes/derivados."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2942,16 +2863,11 @@ msgid "Full Account Name"
 msgstr "Nome Completo da Conta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2972,9 +2888,7 @@ msgid "Document: Customer account statement"
 msgstr "Documento: demonstrativo da conta cliente"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Contas"
 
@@ -3019,10 +2933,8 @@ msgid "Centralisation"
 msgstr "Centralização"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Código da taxa"
@@ -3065,14 +2977,12 @@ msgstr ""
 "mais o prazo de pagamento\""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situação"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3112,8 +3022,7 @@ msgid "Cancel selected invoices"
 msgstr "Cancelar faturas selecionadas"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3136,28 +3045,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Definir como Provisório"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referencia ao documento que produziu esta fatura."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "A Pagar"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Base"
 
@@ -3167,8 +3071,7 @@ msgid "Model Name"
 msgstr "Nome do modelo"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Outros"
 
@@ -3178,15 +3081,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validar"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legenda"
 
@@ -3201,17 +3102,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3232,12 +3130,9 @@ msgid "By Date and Period"
 msgstr "Por data e período"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Observações"
@@ -3252,8 +3147,7 @@ msgstr ""
 "pagamentos."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3278,21 +3172,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Codificação de demonstrativos para lançamentos de pagamento"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Código"
 
@@ -3302,8 +3190,7 @@ msgid "Financial Management"
 msgstr "Administração financeira"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nada"
@@ -3330,8 +3217,7 @@ msgid "Additionnal Information"
 msgstr "Informação adicional"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Nome da taxa"
@@ -3408,8 +3294,7 @@ msgid "Partner Balance"
 msgstr "Saldo do parceiro"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Ficha de terceiros"
 
@@ -3424,8 +3309,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3464,8 +3348,7 @@ msgid "Import invoice"
 msgstr "Importar fatura"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Criado"
@@ -3481,8 +3364,7 @@ msgid "Invoice line"
 msgstr "Linha da fatura"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -3511,15 +3393,13 @@ msgstr ""
 "moeda"
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Conta-pai de Impostos"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3555,8 +3435,7 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Saldo transferido de para"
 
@@ -3632,8 +3511,7 @@ msgid "Journal code"
 msgstr "Código do diário"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Criar lançamentos"
 
@@ -3692,14 +3570,11 @@ msgstr ""
 "(VAT) relativos a este código de imposto apareçam nas faturas"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sequencia"
@@ -3767,8 +3642,7 @@ msgstr "Inscriçãoda conta"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data de vencimento"
 
@@ -3788,8 +3662,7 @@ msgid "Account Configure Wizard "
 msgstr "Assistente de configuração de conta "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Data de Início"
@@ -3827,8 +3700,7 @@ msgid "Unreconciled"
 msgstr "Não conciliado"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Nota"
 
@@ -3861,8 +3733,7 @@ msgid "Entry Sequence"
 msgstr "Sequencia de lançamento"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Fechado"
 
@@ -3992,12 +3863,9 @@ msgid "Code/Date"
 msgstr "Código/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Ativo"
@@ -4049,20 +3917,15 @@ msgid "Secondary Currency"
 msgstr "Moeda secundária"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4095,8 +3958,7 @@ msgid "Account Move"
 msgstr "Movimentos da Conta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Linhas do demonstrativo"
 
@@ -4193,18 +4055,15 @@ msgid "Journal Column"
 msgstr "Coluna do diário"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Concluído"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4217,8 +4076,7 @@ msgid "Periods"
 msgstr "Períodos"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4245,8 +4103,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Custos analíticos para fatura de compra, planilhas, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Taxas padrão"
 
@@ -4306,8 +4163,7 @@ msgstr "Controlos de tipo"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Nome da conta"
 
@@ -4398,8 +4254,7 @@ msgid "Import file from your bank statement"
 msgstr "Importar arquivo do seu extrato bancário"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tipo interno"
 
@@ -4425,14 +4280,12 @@ msgid "Posted"
 msgstr "Publicado"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Notas de crédito"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Data de Término"
 
@@ -4453,8 +4306,7 @@ msgid "Day of the Month"
 msgstr "Dia do mês"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Linhas"
 
@@ -4475,8 +4327,7 @@ msgstr ""
 "impostos derivados."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaração da taxa"
 
@@ -4536,14 +4387,12 @@ msgid "The optional quantity on entries"
 msgstr "A quantidade opcional nos lançamentos"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JNRL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Estado"
 
@@ -4579,8 +4428,7 @@ msgstr "Data de início"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4699,11 +4547,9 @@ msgstr "Lançamentos válidos da fatura"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4800,12 +4646,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Imprimir saldo tentativo anterior"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4885,8 +4728,7 @@ msgid "Control Invoice"
 msgstr "Controlar fatura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Receber"
@@ -4913,8 +4755,7 @@ msgstr "Imposto:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4925,8 +4766,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Mapeamento de contas"
@@ -4942,8 +4782,7 @@ msgid "Account Reconciliation"
 msgstr "Reconciliação da conta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4958,8 +4797,7 @@ msgid "Parent Account Template"
 msgstr "Modelo de conta-pai"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4980,8 +4818,7 @@ msgid "Analytic account"
 msgstr "Conta analítica"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Fatura do fornecedor"
 
@@ -4991,22 +4828,16 @@ msgid "Valid"
 msgstr "Válido"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Débito"
@@ -5068,8 +4899,7 @@ msgid "Reporting"
 msgstr "Relatórios"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5100,8 +4930,7 @@ msgid "Configuration"
 msgstr "Configuração"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Quantia total"
 
@@ -5124,8 +4953,7 @@ msgstr "Conta de receita no modelo de produtos"
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr ""
-"Força todos os movimentos dessa conta para usarem a moeda secundária."
+msgstr "Força todos os movimentos dessa conta para usarem a moeda secundária."
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
@@ -5152,14 +4980,12 @@ msgid "Paid invoice"
 msgstr "Fatura paga"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definição da taxa"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grupo da taxa"
 
@@ -5202,8 +5028,7 @@ msgid "With movements"
 msgstr "Com movimentos"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domínio"
 
@@ -5228,9 +5053,7 @@ msgid "Manually"
 msgstr "Manualmente"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5247,8 +5070,7 @@ msgid "Payable Accounts"
 msgstr "Contas a pagar"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Linha da fatura"
 
@@ -5300,8 +5122,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "A outra moeda opcional se este for um lançamento multi-moeda"
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Pagamentos"
@@ -5347,12 +5168,9 @@ msgstr "Escolha diário e data de pagamento"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Provisório"
@@ -5379,8 +5197,7 @@ msgid "Are you sure ?"
 msgstr "Tem certeza?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Pro-forma"
 
@@ -5416,22 +5233,16 @@ msgid "Supplier Invoice Process"
 msgstr "Processo de fatura do fornecedor"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informação Opcional"
 
@@ -5447,8 +5258,7 @@ msgid "Receivable and Payable"
 msgstr "A receber e a pagar"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5474,8 +5284,7 @@ msgstr ""
 "campo conterá um valor básico (sem o imposto)"
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calcular"
@@ -5519,8 +5328,7 @@ msgid "End of period"
 msgstr "Fim de período"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Conta Lançamento"
 
@@ -5531,8 +5339,7 @@ msgid "General Journal"
 msgstr "Diário geral"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5540,12 +5347,9 @@ msgstr "Diário geral"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5591,11 +5395,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "A sequência utilizada para numeração das faturas neste diário."
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informações Gerais"
 
@@ -5637,8 +5438,7 @@ msgid "List of Accounts"
 msgstr "Lista de contas"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Propriedades das vendas"
 
@@ -5731,15 +5531,11 @@ msgstr "intraCom"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -5787,8 +5583,7 @@ msgstr ""
 "parceiro atual"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Codigo do caso"
 
@@ -5870,8 +5665,7 @@ msgstr "Definições do modelo"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Dinheiro"
 
@@ -5911,8 +5705,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Mantenha vazia para todos os anos fiscais abertos"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Reembolso a fornecedor"
 
@@ -5961,10 +5754,8 @@ msgstr ""
 "categoria de produto"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5998,10 +5789,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Nome do ano fiscal para as telas"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6060,8 +5849,7 @@ msgstr "Sim"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Marque isto se ao usuário é permitido reconciliar lançamentos nesta conta."
 
@@ -6070,5 +5858,333 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Processar Datas de Lançamento"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas as Contas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Seleção de entradas baseada em"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificação"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Período Financeiro"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Saldo da Conta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Selecione o(s) Período(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Porcentagem"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selecione conta de referência (para comparação %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Conta Saldo Comparar Anos"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar relatório em formato de paisagem"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparação em %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selecione o Período"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opções de Relatório"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Não Comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar Contas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index fd54e022cb3..503864fabcf 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -92,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Intreari neconciliate"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Cod de baza"
@@ -125,8 +124,7 @@ msgid "Residual"
 msgstr "Rezidual"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -190,10 +188,8 @@ msgid "Move line select"
 msgstr "Selecţie linie mişcare"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Etichetă înregistrare"
 
@@ -208,14 +204,12 @@ msgid "Period Sum"
 msgstr "Suma pentru perioadă"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Determină codul (if type=code)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Linie înregistrare contabilă"
 
@@ -232,12 +226,9 @@ msgstr "Înregistrări recurente"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Sumă"
@@ -279,8 +270,7 @@ msgstr ""
 "machete."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -294,14 +284,12 @@ msgstr ""
 "peste o lună."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Rezolvat"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Plăţi restante"
 
@@ -317,8 +305,7 @@ msgid "Select period"
 msgstr "Selectare perioadă"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Origine"
 
@@ -348,8 +335,7 @@ msgid "Delta Debit"
 msgstr "Diferenţă debit"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Taxă"
@@ -368,14 +354,12 @@ msgid "Analytic Account"
 msgstr "Cont analitic"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Taxa pentru poziţiile subordonate"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Nume jurnal"
@@ -443,11 +427,8 @@ msgid "Contra"
 msgstr "Contra"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Stare"
@@ -459,8 +440,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Restituiri furnizor neplătite"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Calcul special"
 
@@ -482,10 +462,8 @@ msgid "Disc.(%)"
 msgstr "Disc.(%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -620,8 +598,7 @@ msgstr "Comenzi înregistrări"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
-msgstr ""
-"Campul secventa este folosit pentru ordonarea ascendentă a resurselor"
+msgstr "Campul secventa este folosit pentru ordonarea ascendentă a resurselor"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -683,8 +660,7 @@ msgid "Sub-Total :"
 msgstr "Subtotal :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -716,8 +692,7 @@ msgid "Select the Period for Analysis"
 msgstr "Selectare perioadă pentru analiză"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -749,8 +724,7 @@ msgid "Field Name"
 msgstr "Nume câmp"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Semn pentru părinte"
 
@@ -760,8 +734,7 @@ msgid "End of Year Entries Journal"
 msgstr "Jurnal înregistrări închidere de an"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Proprietăţi cumpărare"
 
@@ -781,12 +754,9 @@ msgid "Move Lines Created."
 msgstr "Linii mişcare create."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Stare"
 
@@ -943,10 +913,8 @@ msgstr "Selectaţi planul de conturi"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Cantitate"
@@ -989,16 +957,13 @@ msgstr "factură analitică"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1020,8 +985,7 @@ msgid "Net Total:"
 msgstr "Total net :"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1145,8 +1109,7 @@ msgid "Fiscal Position Templates"
 msgstr "Şabloane poziţii fiscale"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preţ unitar"
 
@@ -1305,8 +1268,7 @@ msgid "Not reconciled transactions"
 msgstr "Tranzacţii necompensate"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Corespondenţă taxe"
@@ -1328,8 +1290,7 @@ msgid "Write-Off account"
 msgstr "Cont ajustări"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1356,11 +1317,9 @@ msgstr ""
 "Selectează facturile pe care doriţi să le plătiţi şi gestionează avansurile"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Machetă"
 
@@ -1431,8 +1390,7 @@ msgstr "Tipuri de conturi"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1448,8 +1406,7 @@ msgid "Journal"
 msgstr "Jurnal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Conturi descendente"
 
@@ -1475,8 +1432,7 @@ msgid "Statement reconcile line"
 msgstr "Linie confirmare situaţie"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Păstraţi necompletat pentru a utiliza contul de venituri."
 
@@ -1605,8 +1561,7 @@ msgid "Account n°"
 msgstr "Cont nr."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Lasaţi necompletat dacă doriţi folosirea contului de cheltuieli"
 
@@ -1616,8 +1571,7 @@ msgid "Account to reconcile"
 msgstr "Conturi de compensat"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Ref. Partener"
@@ -1629,14 +1583,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Conturi debitori şi creditori"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Linii subscripţie"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1800,8 +1752,7 @@ msgid "Period length (days)"
 msgstr "Durata (zile)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
@@ -1812,8 +1763,7 @@ msgid "Charts"
 msgstr "Planuri de conturi"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1888,12 +1838,9 @@ msgstr "x Jurnal cu note de credit pentru cheltuieli"
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tip"
 
@@ -2041,8 +1988,7 @@ msgid "Journal-Period Name"
 msgstr "Denumirea perioadei jurnalului"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Nume dosar taxe"
 
@@ -2060,8 +2006,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2134,10 +2079,8 @@ msgstr "Anterior"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Monedă"
@@ -2175,8 +2118,7 @@ msgid "Analytic Entry"
 msgstr "Înregistrare analitică"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mesaj plăţi restante"
 
@@ -2228,8 +2170,7 @@ msgid "Detail"
 msgstr "Detalii"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Consolidare"
 
@@ -2301,8 +2242,7 @@ msgstr "Data facturării"
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
-"Dacă rămane necompletat, vor fi luate în considerare toate perioadele"
+msgstr "Dacă rămane necompletat, vor fi luate în considerare toate perioadele"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2327,21 +2267,16 @@ msgid "The account basis of the tax declaration."
 msgstr "Baza de conturi pentru declaraţia fiscală"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
@@ -2358,8 +2293,7 @@ msgid "Unreconcile"
 msgstr "Anulare compensare"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Tip taxă"
 
@@ -2369,8 +2303,7 @@ msgid "Statement Entries"
 msgstr "Înregistrări din situaţii"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
@@ -2459,8 +2392,7 @@ msgid "Date End"
 msgstr "Data sfârşit"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2468,8 +2400,7 @@ msgid "Entry Lines"
 msgstr "Linii înregistrări"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Cod aplicabil (if type=code)"
 
@@ -2558,11 +2489,9 @@ msgstr "Creare factură pe baza conturilor analitice"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2581,8 +2510,7 @@ msgstr "Creare factură pe baza conturilor analitice"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Renunțare"
 
@@ -2592,10 +2520,8 @@ msgid "Acc. Type Name"
 msgstr "Denumire tip cont"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2609,8 +2535,7 @@ msgid "Litigation"
 msgstr "Litigiu"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informaţii"
@@ -2697,9 +2622,9 @@ msgid ""
 msgstr ""
 "Acest tip se foloseşte pentru a deosebi tipurile cu efecte speciale în "
 "OpenERP: prezentare nu poate avea înregistrări, consolidare sunt conturi "
-"care pot avea conturi subordonate pentru agregare multi-companie, "
-"încasare/plată sunt pentru conturile partener (pentru calculul "
-"creditului/debitului), închis pentru conturi învechite."
+"care pot avea conturi subordonate pentru agregare multi-companie, încasare/"
+"plată sunt pentru conturile partener (pentru calculul creditului/debitului), "
+"închis pentru conturi învechite."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2727,8 +2652,7 @@ msgid "Price"
 msgstr "Preț"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2795,17 +2719,13 @@ msgid "Invoice Reference"
 msgstr "Referinţa facturii"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Nume"
@@ -2848,8 +2768,7 @@ msgstr ""
 "subordonate. În acest caz, ordinea evaluării este importantă."
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2942,16 +2861,11 @@ msgid "Full Account Name"
 msgstr "Denumire completă cont"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2972,9 +2886,7 @@ msgid "Document: Customer account statement"
 msgstr "Document: Situaţie cont client"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Contabilitate"
 
@@ -3019,10 +2931,8 @@ msgid "Centralisation"
 msgstr "Centralizare"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Cod taxă"
@@ -3065,14 +2975,12 @@ msgstr ""
 "termenul de plată pentru partener."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situaţie"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Document"
 
@@ -3112,8 +3020,7 @@ msgid "Cancel selected invoices"
 msgstr "Anulare facturi selectate"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3136,28 +3043,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Setează Ciornă"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referinţa la documentul care a produs factura."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Furnizori"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Bază"
 
@@ -3167,8 +3069,7 @@ msgid "Model Name"
 msgstr "Denumire model"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Altele"
 
@@ -3178,15 +3079,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Validare"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Legendă"
 
@@ -3201,17 +3100,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3232,12 +3128,9 @@ msgid "By Date and Period"
 msgstr "După dată şi perioadă"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Note"
@@ -3252,8 +3145,7 @@ msgstr ""
 "plăţi."
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3278,21 +3170,15 @@ msgid "Statement encoding produces payment entries"
 msgstr "Codarea situaţiei generează înregistrări de plăţi"
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Cod"
 
@@ -3302,8 +3188,7 @@ msgid "Financial Management"
 msgstr "Management financiar"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Lipsă"
@@ -3330,8 +3215,7 @@ msgid "Additionnal Information"
 msgstr "Informații suplimentare"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Denumire taxă"
@@ -3408,8 +3292,7 @@ msgid "Partner Balance"
 msgstr "Balanţă parteneri"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr "Carte mare terţi"
 
@@ -3424,8 +3307,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3464,8 +3346,7 @@ msgid "Import invoice"
 msgstr "Factură import"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Creare"
@@ -3481,8 +3362,7 @@ msgid "Invoice line"
 msgstr "Poziţie factură"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Scurtătură"
 
@@ -3512,15 +3392,13 @@ msgstr ""
 "multi-monedă."
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Cont taxă părinte"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3556,8 +3434,7 @@ msgid "Central Journal"
 msgstr "Jurnal central"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Balanţă înaintată"
 
@@ -3633,8 +3510,7 @@ msgid "Journal code"
 msgstr "Cod jurnal"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Creează înregistrări"
 
@@ -3694,14 +3570,11 @@ msgstr ""
 "factură"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Secvenţă"
@@ -3769,8 +3642,7 @@ msgstr "Subscripţie cont"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Data scadenţei"
 
@@ -3790,8 +3662,7 @@ msgid "Account Configure Wizard "
 msgstr "Utilitar configurare conturi "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Dată de început"
@@ -3829,8 +3700,7 @@ msgid "Unreconciled"
 msgstr "Decompensat"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Notă"
 
@@ -3863,8 +3733,7 @@ msgid "Entry Sequence"
 msgstr "Secvenţa înregistrării"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Închis"
 
@@ -3992,12 +3861,9 @@ msgid "Code/Date"
 msgstr "Cod/Data"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Activ"
@@ -4049,20 +3915,15 @@ msgid "Secondary Currency"
 msgstr "Monedă secundară"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4095,8 +3956,7 @@ msgid "Account Move"
 msgstr "Miscare cont"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Linii situaţii"
 
@@ -4193,18 +4053,15 @@ msgid "Journal Column"
 msgstr "Coloană jurnal"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Gata"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4217,8 +4074,7 @@ msgid "Periods"
 msgstr "Perioade"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4245,8 +4101,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr "Costuri analitice de refacturare cumpărări, programare, ..."
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Taxe implicite"
 
@@ -4305,8 +4160,7 @@ msgstr "Controale de tip"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Denumire cont"
 
@@ -4397,8 +4251,7 @@ msgid "Import file from your bank statement"
 msgstr "Import fişier din înregistrările din bancă"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Tip intern"
 
@@ -4424,14 +4277,12 @@ msgid "Posted"
 msgstr "Publicat"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Note de credit"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Dată de sfârșit"
 
@@ -4452,8 +4303,7 @@ msgid "Day of the Month"
 msgstr "Ziua din lună"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Linii"
 
@@ -4474,8 +4324,7 @@ msgstr ""
 "subordonate. În acest caz ordinea evaluării este importantă."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Declaraţie taxe"
 
@@ -4535,14 +4384,12 @@ msgid "The optional quantity on entries"
 msgstr "Cantitatea opţională din înregistrări"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr "JRNL"
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Stări"
 
@@ -4578,8 +4425,7 @@ msgstr "Data de început"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4698,11 +4544,9 @@ msgstr "Înregistrări valide din factură"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4799,12 +4643,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Tipărire balanţa de verificare terţi după vechime"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4883,8 +4724,7 @@ msgid "Control Invoice"
 msgstr "Factură de control"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Debitor"
@@ -4911,8 +4751,7 @@ msgstr "TVA:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4923,8 +4762,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Corespondenţă conturi"
@@ -4940,8 +4778,7 @@ msgid "Account Reconciliation"
 msgstr "Compensare cont"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Confirmare"
 
@@ -4956,8 +4793,7 @@ msgid "Parent Account Template"
 msgstr "Şablon cont părinte"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4977,8 +4813,7 @@ msgid "Analytic account"
 msgstr "Cont analitic"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Factură furnizor"
 
@@ -4988,22 +4823,16 @@ msgid "Valid"
 msgstr "Valid"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Debit"
@@ -5065,8 +4894,7 @@ msgid "Reporting"
 msgstr "Raportare"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5097,8 +4925,7 @@ msgid "Configuration"
 msgstr "Configurație"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Valoare totală"
 
@@ -5149,14 +4976,12 @@ msgid "Paid invoice"
 msgstr "Factură plătită"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definire taxe"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Grup taxe"
 
@@ -5199,8 +5024,7 @@ msgid "With movements"
 msgstr "Cu mişcări"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domeniu"
 
@@ -5225,9 +5049,7 @@ msgid "Manually"
 msgstr "Manual"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5244,8 +5066,7 @@ msgid "Payable Accounts"
 msgstr "Conturi furnizori"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Linie factură"
 
@@ -5296,8 +5117,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr "Moneda opţională pentru înregistrări multi-monedă."
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Plăţi"
@@ -5343,12 +5163,9 @@ msgstr "Alegeţi jurnalul şi data plăţii"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Ciornă"
@@ -5375,8 +5192,7 @@ msgid "Are you sure ?"
 msgstr "Sigur ?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Proformă"
 
@@ -5412,22 +5228,16 @@ msgid "Supplier Invoice Process"
 msgstr "Proces factură furnizor"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Pagină"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Informații opționale"
 
@@ -5443,8 +5253,7 @@ msgid "Receivable and Payable"
 msgstr "Clienţi şi furnizori"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5469,8 +5278,7 @@ msgstr ""
 "cod taxă de bază, câmpul va conţine suma de bază (fără taxe)."
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Calculare"
@@ -5514,8 +5322,7 @@ msgid "End of period"
 msgstr "Sfârşitul perioadei"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Înregistrare contabilă"
 
@@ -5526,8 +5333,7 @@ msgid "General Journal"
 msgstr "Jurnal general"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5535,12 +5341,9 @@ msgstr "Jurnal general"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Sold"
@@ -5586,11 +5389,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Secvenţa utilizată pentru numerele de factură în acest jurnal"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Informații generale"
 
@@ -5632,8 +5432,7 @@ msgid "List of Accounts"
 msgstr "Lista conturilor"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Proprietăţi vanzări"
 
@@ -5726,15 +5525,11 @@ msgstr "ComInt"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Descriere"
 
@@ -5781,8 +5576,7 @@ msgstr ""
 "Acesta va fi cont furnizor în locul celui implicit pentru partenerul curent"
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Cod dosar"
 
@@ -5864,8 +5658,7 @@ msgstr "Definire modele"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Numerar"
 
@@ -5905,8 +5698,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr "Pentru toţi anii fiscali deschişi lăsaţi necompletat"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Restituire de la furnizor"
 
@@ -5955,10 +5747,8 @@ msgstr ""
 "categoria curentă de produse"
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5992,10 +5782,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Denumirea afişată pentru anul fiscal"
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -6054,8 +5842,7 @@ msgstr "Da"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Bifaţi daca utilizatorul are dreptul să compenseze înregistrările din acest "
 "cont."
@@ -6065,5 +5852,358 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Calculează datele înregistrării"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Conturi analitice de închis"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Facturi în ciornă"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Panou contabilitate"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Conturi de facturat"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Costuri de facturat"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Creanţe încasare învechite"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Panou pentru contabil"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Conturi de venituri"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Indicatorii mei"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Panou cont"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Venit învechit"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Afişare informaţii debit/credit"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Toate conturile"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selectare înregistrări după"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificare"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Perioadă financiară"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Sold cont"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Selectare perioadă(e)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Procentaj"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparare ani selectaţi după"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Selectare an(i) fiscal(i) (maxim trei ani)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Selectare cont referinţă (pentru comparare %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Sold conturi - compară ani"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Modulul Sold cont este o funcţionalitate adăugată la modulul Management "
+"financiar.\n"
+"\n"
+"    Acest modul vă oferă opţiuni variate pentru tipărirea extraselor de "
+"cont\n"
+"\n"
+"    1. Puteţi compara extrasele pentru diferiţi ani\n"
+"\n"
+"    2. Puteţi opta pentru comparare monetară sau procentuală între doi ani\n"
+"\n"
+"    3. Puteţi alege un cont de referinţă pentru comparare procentuală faţă "
+"de un anumit an\n"
+"\n"
+"    4. Puteţi selecta perioade după data actuală sau după data creării\n"
+"\n"
+"    5. Aveţi opţiunea de a tipări rapoartele dorite în format vedere.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+"Trebuie să selectaţi opţiunea 'landscape' (vedere). Verificaţi, vă rog."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Afişează raportul în format vedere"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Afişează comparaţia în %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Selectare perioadă"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opţiuni raport"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Nu compara"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Afişează conturi"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Aţi selectat mai mult de 3 ani."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Management financiar contabil - Comparare conturi"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "An :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Puteţi selecta maxim 3 ani. Reîncercaţi."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Aţi selectat opţiunea 'Procentaj' pe mai mult de 2 ani, dar nu aţi ales "
+"formatul vedere."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Poate aţi făcut vreuna din următoarele greşeli. Corectaţi şi reîncercaţi."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Lasaţi necompletat pentru comparare cu contul părinte"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data creării"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"2. Nu aţi selectat opţiunea 'procentaj', dar aţi selectat mai mult de 2 ani."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"S-ar putea să fi selectat opţiunile de comparare cu mai mult de 1 an, cu "
+"coloanele debit/credit şi opţiunea %. Toate acestea ar putea genera un "
+"raport ce nu se încadrează în pagină. Reîncercaţi."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Trebuie să selectaţi cel puţin 1 an fiscal. Reîncercaţi."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Raport personalizat"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 883b0d5859e..699df15a9a2 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -93,8 +93,7 @@ msgid "Unreconciled entries"
 msgstr "Несогласованные проводки"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Базовый Код"
@@ -126,8 +125,7 @@ msgid "Residual"
 msgstr "Остаток"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -188,10 +186,8 @@ msgid "Move line select"
 msgstr "Выберите строку для перемещения"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Метка проводки"
 
@@ -206,14 +202,12 @@ msgid "Period Sum"
 msgstr "Сумма за период"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Вычислить код (если тип=код)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Проводка по счету"
 
@@ -230,12 +224,9 @@ msgstr "Повторяющиеся проводки"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Сумма"
@@ -277,8 +268,7 @@ msgstr ""
 "быстрого редактирования каждой книги проводок."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -292,14 +282,12 @@ msgstr ""
 "50% сегодня, 50% в следующем месяце."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Фиксированный"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Просроченные платежи"
 
@@ -315,8 +303,7 @@ msgid "Select period"
 msgstr "Выбрать период"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Происхождение"
 
@@ -346,8 +333,7 @@ msgid "Delta Debit"
 msgstr "Дебетовое сальдо"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Налог"
@@ -366,14 +352,12 @@ msgid "Analytic Account"
 msgstr "Счет аналитического учета"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Налог на детей"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Название журнала"
@@ -441,11 +425,8 @@ msgid "Contra"
 msgstr "Сторно"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Состояние"
@@ -457,8 +438,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Невыплаченные возвраты средств от поставщика"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Специальные расчеты"
 
@@ -480,10 +460,8 @@ msgid "Disc.(%)"
 msgstr "Дисконт (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ссылка"
@@ -676,8 +654,7 @@ msgid "Sub-Total :"
 msgstr "Подитог:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -709,8 +686,7 @@ msgid "Select the Period for Analysis"
 msgstr "Выберите период для проведения анализа"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -742,8 +718,7 @@ msgid "Field Name"
 msgstr "Название поля"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -753,8 +728,7 @@ msgid "End of Year Entries Journal"
 msgstr "Журнал проводок конца года"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Свойства покупки"
 
@@ -774,12 +748,9 @@ msgid "Move Lines Created."
 msgstr "Строка финансового документа создана."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Статус"
 
@@ -936,10 +907,8 @@ msgstr "Выбор плана счетов"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Количество"
@@ -982,16 +951,13 @@ msgstr "aналитический счет"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1013,8 +979,7 @@ msgid "Net Total:"
 msgstr "Итог нетто"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1138,8 +1103,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Цена за ед."
 
@@ -1292,8 +1256,7 @@ msgid "Not reconciled transactions"
 msgstr "Не сверенные транзакции"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1315,8 +1278,7 @@ msgid "Write-Off account"
 msgstr "Счет списания"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Модель"
 
@@ -1342,11 +1304,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Вид"
 
@@ -1415,8 +1375,7 @@ msgstr "Типы счетов"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1432,8 +1391,7 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1459,8 +1417,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Оставьте пустым для использования доходного счета"
 
@@ -1587,8 +1544,7 @@ msgid "Account n°"
 msgstr "№ счета"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Оставьте пустым для использования счета расходов"
 
@@ -1598,8 +1554,7 @@ msgid "Account to reconcile"
 msgstr "Счет для сверки"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Ссылка на партнера"
@@ -1611,14 +1566,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Позиции подписки"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1783,8 +1736,7 @@ msgid "Period length (days)"
 msgstr "Длина периода (в днях)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
@@ -1795,8 +1747,7 @@ msgid "Charts"
 msgstr "Планы счетов"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1870,12 +1821,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Тип"
 
@@ -2023,8 +1971,7 @@ msgid "Journal-Period Name"
 msgstr "Журнал - название периода"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2039,8 +1986,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2113,10 +2059,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Валюта"
@@ -2154,8 +2098,7 @@ msgid "Analytic Entry"
 msgstr "Проводка аналитики"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2207,8 +2150,7 @@ msgid "Detail"
 msgstr "Подробности"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Объединение"
 
@@ -2303,21 +2245,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Дата"
@@ -2334,8 +2271,7 @@ msgid "Unreconcile"
 msgstr "Не сверено"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Тип налога"
 
@@ -2345,8 +2281,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
@@ -2432,8 +2367,7 @@ msgid "Date End"
 msgstr "Дата окончания"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2441,8 +2375,7 @@ msgid "Entry Lines"
 msgstr "Строки проводок"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Применимый код (если тип=код)"
 
@@ -2531,11 +2464,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2554,8 +2485,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -2565,10 +2495,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2582,8 +2510,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Информация"
@@ -2693,8 +2620,7 @@ msgid "Price"
 msgstr "Цена"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2761,17 +2687,13 @@ msgid "Invoice Reference"
 msgstr "Ссылка на счет"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Название"
@@ -2811,8 +2733,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2905,16 +2826,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2935,9 +2851,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Бухгалтерский"
 
@@ -2982,10 +2896,8 @@ msgid "Centralisation"
 msgstr "Централизация"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Код налога"
@@ -3025,14 +2937,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Документ"
 
@@ -3070,8 +2980,7 @@ msgid "Cancel selected invoices"
 msgstr "Отменить выбранные счета"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3094,28 +3003,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "К оплате"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "База"
 
@@ -3125,8 +3029,7 @@ msgid "Model Name"
 msgstr "Название модели"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3136,15 +3039,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Проверить"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Описание"
 
@@ -3159,17 +3060,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3190,12 +3088,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Примечания"
@@ -3208,8 +3103,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3234,21 +3128,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Код"
 
@@ -3258,8 +3146,7 @@ msgid "Financial Management"
 msgstr "Управление финансами"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Ничего"
@@ -3287,8 +3174,7 @@ msgid "Additionnal Information"
 msgstr "Доп. информация"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Название налога"
@@ -3365,8 +3251,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3379,8 +3264,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3417,8 +3301,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Создать"
@@ -3434,8 +3317,7 @@ msgid "Invoice line"
 msgstr "Позиция счета"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Горячая клвиша"
 
@@ -3460,15 +3342,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3504,8 +3384,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3581,8 +3460,7 @@ msgid "Journal code"
 msgstr "Код журнала"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Создать проводки"
 
@@ -3638,14 +3516,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Последовательность"
@@ -3711,8 +3586,7 @@ msgstr "Счет подписки"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Срок плетежа"
 
@@ -3732,8 +3606,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3771,8 +3644,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Заметка"
 
@@ -3796,8 +3668,7 @@ msgid "Entry Sequence"
 msgstr "Последовательный номер проводки"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Закрыто"
 
@@ -3918,12 +3789,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Активен"
@@ -3975,20 +3843,15 @@ msgid "Secondary Currency"
 msgstr "Вторичная валюта"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4019,8 +3882,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Позиции выписки"
 
@@ -4112,18 +3974,15 @@ msgid "Journal Column"
 msgstr "Столбец журнала"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Выполнено"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4136,8 +3995,7 @@ msgid "Periods"
 msgstr "Периоды"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4164,8 +4022,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Налоги по умолчанию"
 
@@ -4220,8 +4077,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Название счета"
 
@@ -4312,8 +4168,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4339,14 +4194,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4367,8 +4220,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Строк"
 
@@ -4386,8 +4238,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Налоговая декларация"
 
@@ -4447,14 +4298,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Cостояния"
 
@@ -4490,8 +4339,7 @@ msgstr "Дата начала"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Всего"
 
@@ -4608,11 +4456,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4707,12 +4553,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ссылка"
 
@@ -4762,10 +4605,9 @@ msgid "Account cost and revenue by journal (This Month)"
 msgstr "Расходы и доходы по журналам (текущий месяц)"
 
 #. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Счета к получению"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4789,8 +4631,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Счета к получению"
@@ -4817,8 +4658,7 @@ msgstr "НДС:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4829,8 +4669,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4846,8 +4685,7 @@ msgid "Account Reconciliation"
 msgstr "Сверка счета"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -4862,8 +4700,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4884,8 +4721,7 @@ msgid "Analytic account"
 msgstr "Счет аналитики"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Счета поставщиков"
 
@@ -4895,22 +4731,16 @@ msgid "Valid"
 msgstr "Корректный"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Дебет"
@@ -4972,8 +4802,7 @@ msgid "Reporting"
 msgstr "Отчетность"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5004,8 +4833,7 @@ msgid "Configuration"
 msgstr "Настройки"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Итоговая сумма"
 
@@ -5055,14 +4883,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Определение налога"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Группа налога"
 
@@ -5103,8 +4929,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Домен"
 
@@ -5129,9 +4954,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5148,8 +4971,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Позиция счета"
 
@@ -5200,8 +5022,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5247,12 +5068,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Черновик"
@@ -5279,8 +5097,7 @@ msgid "Are you sure ?"
 msgstr "Вы уверены?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
@@ -5316,22 +5133,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Доп. информация"
 
@@ -5347,8 +5158,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5371,8 +5181,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Вычислить"
@@ -5416,8 +5225,7 @@ msgid "End of period"
 msgstr "Конец периода"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Проводка по счету"
 
@@ -5428,8 +5236,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5437,12 +5244,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Остаток"
@@ -5486,11 +5290,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Общая информация"
 
@@ -5529,8 +5330,7 @@ msgid "List of Accounts"
 msgstr "Список счетов"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5623,15 +5423,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Описание"
 
@@ -5675,8 +5471,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5758,8 +5553,7 @@ msgstr "Определенеие моделей"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Наличные"
 
@@ -5799,8 +5593,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
@@ -5847,10 +5640,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5884,10 +5675,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5944,11 +5733,338 @@ msgstr "Да"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Счета аналитики к закрытию"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Черновики счетов"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Панель бухг. аналитики"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Счета к выставлению"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Расходы для выставления счетов"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Повременный расход"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Панель контролёра счетов"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Счета доходов"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Мои индикаторы"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Панель счетов"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Повременный доход"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Показать информацию по дебету / кредиту"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Уведомление"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Баланс счета"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Выбрать период(ы)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Сравнить выбранные годы в терминах"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Сравнить учетные годы (Макс. три года)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Выберите соответствующий счет (для  % сравнения)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Баланс по счету - сравнить по годам"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Вывести отчет в ландшафной форме"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Показать сравнение в %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Выберите период"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Параметры отчета"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Показать счета"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. В любом случае, выбрано более чем 3 года."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Настройка отчета"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Счета по типу"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Дебиторская задолженность"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Баланс по типу счетов"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Неделя года"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 5340805fc7f..81266f91ec9 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -91,8 +91,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr ""
@@ -124,8 +123,7 @@ msgid "Residual"
 msgstr "Zostatok"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -189,10 +187,8 @@ msgid "Move line select"
 msgstr "Presunúť vybraný riadok"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -207,14 +203,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -231,12 +225,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Suma"
@@ -273,8 +264,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -283,14 +273,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Omeškané platby"
 
@@ -306,8 +294,7 @@ msgid "Select period"
 msgstr "Výber periody"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -337,8 +324,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Daň"
@@ -357,14 +343,12 @@ msgid "Analytic Account"
 msgstr "Analytický účet"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -432,11 +416,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Štát"
@@ -448,8 +429,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -471,10 +451,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -665,8 +643,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -698,8 +675,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -731,8 +707,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -742,8 +717,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -763,12 +737,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -921,10 +892,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -967,16 +936,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -998,8 +964,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1121,8 +1086,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1275,8 +1239,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1298,8 +1261,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1325,11 +1287,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1398,8 +1358,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1415,8 +1374,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1442,8 +1400,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1570,8 +1527,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1581,8 +1537,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1594,14 +1549,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1765,8 +1718,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1777,8 +1729,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1852,12 +1803,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -1971,7 +1919,7 @@ msgstr ""
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -2005,8 +1953,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2021,8 +1968,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2095,10 +2041,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2136,8 +2080,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2189,8 +2132,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2282,21 +2224,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2313,8 +2250,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2324,8 +2260,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2411,8 +2346,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2420,8 +2354,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2510,11 +2443,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2533,8 +2464,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2544,10 +2474,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2561,8 +2489,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2672,8 +2599,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2740,17 +2666,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2790,8 +2712,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2884,16 +2805,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2914,11 +2830,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: model:ir.ui.menu,name:account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "Účtovníctvo"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2961,10 +2875,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3004,14 +2916,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3049,8 +2959,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3073,28 +2982,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3104,8 +3008,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3115,15 +3018,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3138,17 +3039,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3169,12 +3067,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3187,8 +3082,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3213,21 +3107,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3237,8 +3125,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3265,8 +3152,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3343,8 +3229,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3357,8 +3242,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3395,8 +3279,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3412,8 +3295,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3438,15 +3320,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3482,8 +3362,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3559,8 +3438,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3616,14 +3494,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3689,8 +3564,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3710,8 +3584,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3749,8 +3622,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3774,8 +3646,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3896,12 +3767,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3953,20 +3821,15 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3997,8 +3860,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4090,18 +3952,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4114,8 +3973,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4142,8 +4000,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4196,8 +4053,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4288,8 +4144,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4315,14 +4170,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4343,8 +4196,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4362,8 +4214,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4423,14 +4274,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4466,8 +4315,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4584,11 +4432,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4683,12 +4529,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4738,10 +4581,9 @@ msgid "Account cost and revenue by journal (This Month)"
 msgstr ""
 
 #. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Účty pohľadávok"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4765,8 +4607,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4793,8 +4634,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4805,8 +4645,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4822,8 +4661,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4838,8 +4676,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4857,8 +4694,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4868,22 +4704,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4945,8 +4775,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4977,8 +4806,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5028,14 +4856,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5076,8 +4902,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5102,9 +4927,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5121,8 +4944,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5173,8 +4995,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5220,12 +5041,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5252,8 +5070,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5289,22 +5106,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5320,8 +5131,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5344,8 +5154,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5389,8 +5198,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5401,8 +5209,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5410,12 +5217,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5459,11 +5263,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5502,8 +5303,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5596,15 +5396,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5648,8 +5444,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5731,8 +5526,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5772,8 +5566,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5820,10 +5613,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5857,10 +5648,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5917,11 +5706,68 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Zatvoriť analytické účty"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Návrhy faktúr"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Nástenka účtovníctva"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Účty na faktúre"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Náklady na faktúru"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Moja ukazovatele"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index b135142bda3..6842200be54 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -79,8 +79,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
-"Pustite prazno, če želite uporabiti obdobje potrditve datum (računa) ."
+msgstr "Pustite prazno, če želite uporabiti obdobje potrditve datum (računa) ."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -93,8 +92,7 @@ msgid "Unreconciled entries"
 msgstr "Neusklajene vknjižbe"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Osnovna stopnja"
@@ -126,8 +124,7 @@ msgid "Residual"
 msgstr "Preostali"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -191,10 +188,8 @@ msgid "Move line select"
 msgstr "Izberite knjižbo."
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Označba vknjižbe"
 
@@ -209,14 +204,12 @@ msgid "Period Sum"
 msgstr "Seštevek obdobja"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Izračunaj stopnjo"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Vnosna vrstica konta"
 
@@ -233,12 +226,9 @@ msgstr "Ponavljajoče se knjižbe"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Znesek"
@@ -275,8 +265,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -285,14 +274,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Stalno"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Zamujena plačila"
 
@@ -308,8 +295,7 @@ msgid "Select period"
 msgstr "Izberi obdobje"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Izvor"
 
@@ -339,8 +325,7 @@ msgid "Delta Debit"
 msgstr "Razlika breme"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Davek"
@@ -359,14 +344,12 @@ msgid "Analytic Account"
 msgstr "Analitični konto"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Izračunaj davke po podrejenih zapisih"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Naziv dnevnika"
@@ -434,11 +417,8 @@ msgid "Contra"
 msgstr "Nasproti"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Stanje"
@@ -450,8 +430,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Neplačani dobropisi dobaviteljev"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Poseben izračun"
 
@@ -473,10 +452,8 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Sklic"
@@ -674,8 +651,7 @@ msgid "Sub-Total :"
 msgstr "Vmesna vsota:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -707,8 +683,7 @@ msgid "Select the Period for Analysis"
 msgstr "Izberite obdobje analize"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -740,8 +715,7 @@ msgid "Field Name"
 msgstr "Naziv polja"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Podpiši za nadrejenega"
 
@@ -751,8 +725,7 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjižb za zaključek leta"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Lastnosti nakupa"
 
@@ -772,12 +745,9 @@ msgid "Move Lines Created."
 msgstr "Ustvarejne postavke prenosa."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Stanje"
 
@@ -932,10 +902,8 @@ msgstr "Izberite kontni načrt"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Količina"
@@ -978,16 +946,13 @@ msgstr "Analitični račun"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1009,8 +974,7 @@ msgid "Net Total:"
 msgstr "Skupaj (brez davkov):"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1134,8 +1098,7 @@ msgid "Fiscal Position Templates"
 msgstr "Predloge davčnih pozicij"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena enote"
 
@@ -1288,8 +1251,7 @@ msgid "Not reconciled transactions"
 msgstr "Neusklajene transakcije"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Preslikava davkov"
@@ -1311,8 +1273,7 @@ msgid "Write-Off account"
 msgstr "Konto odpisov"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Model"
 
@@ -1338,11 +1299,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Izbere račune, ki jih želite plačati in upravlja z avansi"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Pogled:"
 
@@ -1413,8 +1372,7 @@ msgstr "Vrste kontov"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1430,8 +1388,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Podrejeni konti"
 
@@ -1457,8 +1414,7 @@ msgid "Statement reconcile line"
 msgstr "Postavka uskladitve izpiska"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Pustite prazno v primeru konta prihodkov"
 
@@ -1587,8 +1543,7 @@ msgid "Account n°"
 msgstr "Konto št."
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Pusti prazno v primeru stroškovnega konta"
 
@@ -1598,8 +1553,7 @@ msgid "Account to reconcile"
 msgstr "Konto za uskladit"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Sklic partnerja"
@@ -1611,14 +1565,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Konti terjatev in obveznosti"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Postavke naročnine"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1782,8 +1734,7 @@ msgid "Period length (days)"
 msgstr "Dolžina obdobja (dni)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Odstotek"
@@ -1794,8 +1745,7 @@ msgid "Charts"
 msgstr "Načrti"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1871,12 +1821,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Vrsta"
 
@@ -2024,8 +1971,7 @@ msgid "Journal-Period Name"
 msgstr "Naziv obdobja dnevnika"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Naziv davčne stopnje"
 
@@ -2037,14 +1983,13 @@ msgid ""
 "manual validation."
 msgstr ""
 "Odkljukajte ta kvadratek, če ne želite, da bo za vknjižbe na tem kontu "
-"potrebna dodatna ročna potrditev prehoda statusa iz \"osnutka\" v "
-"\"knjiženo\" (status \"knjiženo\" bodo pridobile avtomatično)."
+"potrebna dodatna ročna potrditev prehoda statusa iz \"osnutka\" v \"knjiženo"
+"\" (status \"knjiženo\" bodo pridobile avtomatično)."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2057,8 +2002,7 @@ msgstr "Partner"
 msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
-msgstr ""
-"Zaporedna številka računa, izračunana avtomatično ob kreiranju računa."
+msgstr "Zaporedna številka računa, izračunana avtomatično ob kreiranju računa."
 
 #. module: account
 #: rml:account.invoice:0
@@ -2118,10 +2062,8 @@ msgstr "Pretekli"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuta"
@@ -2159,8 +2101,7 @@ msgid "Analytic Entry"
 msgstr "Analitičen vnos"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Sporočilo za opomin za zapadle postavke"
 
@@ -2212,8 +2153,7 @@ msgid "Detail"
 msgstr "Podrobno"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Zgoščeno"
 
@@ -2305,21 +2245,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
@@ -2336,8 +2271,7 @@ msgid "Unreconcile"
 msgstr "Prekliči uskladitev"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Vrsta davka"
 
@@ -2347,8 +2281,7 @@ msgid "Statement Entries"
 msgstr "Postavke izpiska"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Uporabnik"
 
@@ -2436,8 +2369,7 @@ msgid "Date End"
 msgstr "Datum konca"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2445,8 +2377,7 @@ msgid "Entry Lines"
 msgstr "Postavke vknjižbe"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2535,11 +2466,9 @@ msgstr "Izdelava računa na podlagi analitičnih kontov."
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2558,8 +2487,7 @@ msgstr "Izdelava računa na podlagi analitičnih kontov."
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -2569,10 +2497,8 @@ msgid "Acc. Type Name"
 msgstr "Naziv vrste konta"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2586,8 +2512,7 @@ msgid "Litigation"
 msgstr "Pravdanje"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Informacije"
@@ -2697,8 +2622,7 @@ msgid "Price"
 msgstr "Cena"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2765,17 +2689,13 @@ msgid "Invoice Reference"
 msgstr "Sklic računa"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Naziv"
@@ -2815,8 +2735,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2909,16 +2828,11 @@ msgid "Full Account Name"
 msgstr "Polni naziv konta"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2939,9 +2853,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Računovodstvo"
 
@@ -2986,10 +2898,8 @@ msgid "Centralisation"
 msgstr "Centralizacija"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Davčna stopnja"
@@ -3029,14 +2939,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Stanje"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3074,8 +2982,7 @@ msgid "Cancel selected invoices"
 msgstr "Storniraj izbrane račune"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3098,28 +3005,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Preklopi v pripravo"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Obveznosti"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Osnova"
 
@@ -3129,8 +3031,7 @@ msgid "Model Name"
 msgstr "Naziv modela"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Drugi"
 
@@ -3140,15 +3041,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Preveri"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Napotki"
 
@@ -3163,17 +3062,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3194,12 +3090,9 @@ msgid "By Date and Period"
 msgstr "Po datumu in obdobju"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Opombe"
@@ -3212,8 +3105,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3238,21 +3130,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Oznaka"
 
@@ -3262,8 +3148,7 @@ msgid "Financial Management"
 msgstr "Finance"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Nobena"
@@ -3290,8 +3175,7 @@ msgid "Additionnal Information"
 msgstr "Dodatne informacije"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Naziv davka"
@@ -3368,8 +3252,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3382,8 +3265,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3422,8 +3304,7 @@ msgid "Import invoice"
 msgstr "Uvozi račun"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Ustvari"
@@ -3439,8 +3320,7 @@ msgid "Invoice line"
 msgstr "Postavka računa"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Bližnjica"
 
@@ -3465,15 +3345,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Nadrejeni davčni konto"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3509,8 +3387,7 @@ msgid "Central Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3586,8 +3463,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Ustvari vknjižbe"
 
@@ -3643,14 +3519,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Zaporedje"
@@ -3716,8 +3589,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Datum zapadlosti"
 
@@ -3737,8 +3609,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Datum začetka"
@@ -3776,8 +3647,7 @@ msgid "Unreconciled"
 msgstr "Neusklajeni"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Opomba"
 
@@ -3801,8 +3671,7 @@ msgid "Entry Sequence"
 msgstr "Zaporedje vknjižbe"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Zaprt"
 
@@ -3923,12 +3792,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktivno"
@@ -3980,20 +3846,15 @@ msgid "Secondary Currency"
 msgstr "Druga valuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4024,8 +3885,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Postavke izpiska"
 
@@ -4119,18 +3979,15 @@ msgid "Journal Column"
 msgstr "Stolpec dnevnika"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Opravljeno"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4143,8 +4000,7 @@ msgid "Periods"
 msgstr "Obdobja"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4171,8 +4027,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Privzeti davek"
 
@@ -4228,8 +4083,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Naziv konta"
 
@@ -4320,8 +4174,7 @@ msgid "Import file from your bank statement"
 msgstr "Uvoz datoteke z bančnim izpiskom"
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4347,14 +4200,12 @@ msgid "Posted"
 msgstr "Oddano"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Končni datum"
 
@@ -4375,8 +4226,7 @@ msgid "Day of the Month"
 msgstr "Dan v mesecu"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Postavke"
 
@@ -4394,8 +4244,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Davčna napoved"
 
@@ -4455,14 +4304,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Stanja"
 
@@ -4498,8 +4345,7 @@ msgstr "Datum začetka"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Skupaj"
 
@@ -4616,11 +4462,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4717,12 +4561,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Sklic"
 
@@ -4799,8 +4640,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Terjatev"
@@ -4827,8 +4667,7 @@ msgstr "DDV:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Skupaj:"
@@ -4839,8 +4678,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4856,8 +4694,7 @@ msgid "Account Reconciliation"
 msgstr "Uskladitev konta"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Potrdi"
 
@@ -4872,8 +4709,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4893,8 +4729,7 @@ msgid "Analytic account"
 msgstr "Analitični konto"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Račun dobavitelja"
 
@@ -4904,22 +4739,16 @@ msgid "Valid"
 msgstr "Veljavno"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "V breme"
@@ -4981,8 +4810,7 @@ msgid "Reporting"
 msgstr "Poročanje"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5013,8 +4841,7 @@ msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Skupni znesek"
 
@@ -5064,14 +4891,12 @@ msgid "Paid invoice"
 msgstr "Plačani račun"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Definicija davka"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Davčna skupina"
 
@@ -5112,8 +4937,7 @@ msgid "With movements"
 msgstr "S premiki"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domena"
 
@@ -5138,9 +4962,7 @@ msgid "Manually"
 msgstr "Ročno"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5157,8 +4979,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Postavka računa"
 
@@ -5209,8 +5030,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Plačila"
@@ -5256,12 +5076,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Osnutek"
@@ -5288,8 +5105,7 @@ msgid "Are you sure ?"
 msgstr "Ali ste prepričani?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
@@ -5325,22 +5141,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Stran"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Neobvezni podatki"
 
@@ -5356,8 +5166,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5380,8 +5189,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Izračunaj"
@@ -5425,8 +5233,7 @@ msgid "End of period"
 msgstr "Konec obdobja"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Vknjižba"
 
@@ -5437,8 +5244,7 @@ msgid "General Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5446,12 +5252,9 @@ msgstr "Glavni dnevnik"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Saldo"
@@ -5495,11 +5298,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Splošne informacije"
 
@@ -5538,8 +5338,7 @@ msgid "List of Accounts"
 msgstr "Seznam kontov"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5632,15 +5431,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Opis"
 
@@ -5684,8 +5479,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Davčna stopnja"
 
@@ -5767,8 +5561,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Gotovina"
 
@@ -5808,8 +5601,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Dobropis dobavitelja"
 
@@ -5856,10 +5648,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5893,10 +5683,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5953,8 +5741,7 @@ msgstr "Da"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5962,5 +5749,358 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Izračunaj datume vknjižb"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Analitični konti za zapiranje"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Osnutki računov"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Računovodska pregledna plošča"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Zaračunavanje po kontih"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Zaračunavanje stroškov"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Zastarane terjatve"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Odbor za računovodjo"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Konti prihodkov"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Moji kazalci"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Odbor za računovodstvo"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Zastarani prihodki"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Prikaži oinformacijo breme/dobro"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Vsi konti"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Izbira vnosov temelji na"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Obvestilo"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Finančno obdobje"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Stanje konta"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Izberi obdobje(a)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Delež"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Primerjaj izbrana leta po"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Izberite poslovna leta (največ tri)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Izberite referenčni konto (za primerjavo v %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Stanje konta - primerjaj med leti"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"Modul \"Stanje konta\" je dodatek funkcionalnosti modula \"Finančno "
+"upravljanje\".\n"
+"\n"
+"    Ta modul vam nudi različne možnosti za tiskanje bilance stanja.\n"
+"\n"
+"    1. Lahko primerjate bilance stanja za različna leta.\n"
+"\n"
+"    2. Nastavite lahko denarno ali odstotkovno primerjavo med dvema letoma.\n"
+"\n"
+"    3. Lahko nastavite referenčni konto za odstotekovno primerjavo za "
+"posamezna leta.\n"
+"\n"
+"    4. Izberete lahko dobe kot dejanski datum ali obdobja kot datum "
+"nastanka.\n"
+"\n"
+"    5. Imate možnost tiskanja želenega poročila v ležečem formatu.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Izbrati morate možnost \"Ležeče\". Prosim, reverite."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Prikaži poročilo v ležeči obliki"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Skupaj:"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Prikaži primerjavo v %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Izberi obdobje"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Možnosti poročila"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "Ne primerjaj"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Prikaži konto"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. V vsakem primeru ste izbrali več kot 3 leta."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Računovodstvo in finančno upravljanje - primerjaj konte"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Leto:"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "Izberete lahko največ tri leta. Prosim, preverite ponovno."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+"3. Izbrali ste možnost \"odstotki\" za več kot dve leti, vendar niste "
+"izbrali ležečega formata."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Naredili ste naslednje napake. Prosim, popravite jih in poskusite znova."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Pustite prazno za primerjavo z nadrejenim."
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Ustvarjeno dne"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+"3. Niste izbrali možnosti \"odstotki\" , vendatr ste izbrali več kot dve "
+"leti."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+"Najbrž ste izbrali možnost za primerjavo več kot enega leta s kolonami breme/"
+"dobro  in možnostjo %. To lahko privede k temu, da se bo vsebina izpisala "
+"izven papirja. Poskuste znova."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "Izbrati morate vsaj eno poslovno leto. Poskusite znova."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Prilagodi poročilo"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Mesečno obdobje"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Računi narejeni v zadnjih 15-ih dneh"
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Poročilo o računih narejenih v zadnjih 15-ih dneh"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Skupni znesek"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Računi po vrsti"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Zastarane terjatve do danes"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Konti terjatev"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Obseg"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "Modul, ki doda nova poročila na osnovi modula konti."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Poročanje po kontih - poročanje"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Bilanca po vrsti konta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Teden v letu"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Datum izdelave"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Zastarane terjatve"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Neobdavčen znesek"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 07a4c0044af..ce181b1b1d8 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -86,8 +86,7 @@ msgid "Unreconciled entries"
 msgstr "Ej avstämda transaktioner"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Baskod"
@@ -119,8 +118,7 @@ msgid "Residual"
 msgstr "Kvarvarande"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -184,10 +182,8 @@ msgid "Move line select"
 msgstr "Flytta valda rader"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Uppgiftsetikett"
 
@@ -202,14 +198,12 @@ msgid "Period Sum"
 msgstr "Periodtotal"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Konteringspost"
 
@@ -226,12 +220,9 @@ msgstr "Återkommande transaktioner"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Belopp"
@@ -272,8 +263,7 @@ msgstr ""
 "journal."
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -287,14 +277,12 @@ msgstr ""
 "efter en månad."
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Fast"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Förfallna betalningar"
 
@@ -310,8 +298,7 @@ msgid "Select period"
 msgstr "Välj period"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Orginal"
 
@@ -341,8 +328,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Moms"
@@ -361,14 +347,12 @@ msgid "Analytic Account"
 msgstr "Objekt"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Journalnamn"
@@ -436,11 +420,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Status"
@@ -452,8 +433,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Obetald Leverantörskredit"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Specialberäkning"
 
@@ -475,10 +455,8 @@ msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -671,8 +649,7 @@ msgid "Sub-Total :"
 msgstr "Nettototal:"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -704,8 +681,7 @@ msgid "Select the Period for Analysis"
 msgstr "Välj period för analysering"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -737,8 +713,7 @@ msgid "Field Name"
 msgstr "Fältnamn"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -748,8 +723,7 @@ msgid "End of Year Entries Journal"
 msgstr "Årsbokslut"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Inköp av tillgångar"
 
@@ -769,12 +743,9 @@ msgid "Move Lines Created."
 msgstr "Flytta skapade rader"
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Status"
 
@@ -931,10 +902,8 @@ msgstr "Välj kontoplan"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Antal"
@@ -977,16 +946,13 @@ msgstr "Objektfaktura"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -1008,8 +974,7 @@ msgid "Net Total:"
 msgstr "Nettototal:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1131,8 +1096,7 @@ msgid "Fiscal Position Templates"
 msgstr "Förlaga för momsredovisningsnummer"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Styckpris"
 
@@ -1290,8 +1254,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1313,8 +1276,7 @@ msgid "Write-Off account"
 msgstr "Konto för avskrivning"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Modell"
 
@@ -1340,11 +1302,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr "Välj fakturor du vill betala och hantera förväg"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Visa"
 
@@ -1413,8 +1373,7 @@ msgstr "Kontotyper"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1430,8 +1389,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr "Underliggande konton"
 
@@ -1457,8 +1415,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Om blankt används intäktskontot"
 
@@ -1585,8 +1542,7 @@ msgid "Account n°"
 msgstr "Konto Nr"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Om blankt används kostnadskontot"
 
@@ -1596,8 +1552,7 @@ msgid "Account to reconcile"
 msgstr "Konto för avstämning"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Företagsreferense"
@@ -1609,14 +1564,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1780,8 +1733,7 @@ msgid "Period length (days)"
 msgstr "Periodlängd (dgr)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Procent"
@@ -1792,8 +1744,7 @@ msgid "Charts"
 msgstr "Grafer"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1867,12 +1818,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Typ"
 
@@ -2020,8 +1968,7 @@ msgid "Journal-Period Name"
 msgstr "Namn på journalperiod"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2036,8 +1983,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2110,10 +2056,8 @@ msgstr "Tidigare"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Valuta"
@@ -2151,8 +2095,7 @@ msgid "Analytic Entry"
 msgstr "Objektpost"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Förfallna fakturor meddelande"
 
@@ -2204,8 +2147,7 @@ msgid "Detail"
 msgstr "Detalj"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidering"
 
@@ -2299,21 +2241,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Datum"
@@ -2330,8 +2267,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2341,8 +2277,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Användare"
 
@@ -2428,8 +2363,7 @@ msgid "Date End"
 msgstr "Slutdatum"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2437,8 +2371,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2527,11 +2460,9 @@ msgstr "Från objekt, skapa en faktura"
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2550,8 +2481,7 @@ msgstr "Från objekt, skapa en faktura"
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -2561,10 +2491,8 @@ msgid "Acc. Type Name"
 msgstr "Kontotyp namn"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2578,8 +2506,7 @@ msgid "Litigation"
 msgstr "Process"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Information"
@@ -2694,8 +2621,7 @@ msgid "Price"
 msgstr "Pris"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2762,17 +2688,13 @@ msgid "Invoice Reference"
 msgstr "Fakturareferens"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Namn"
@@ -2812,8 +2734,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2906,16 +2827,11 @@ msgid "Full Account Name"
 msgstr "Kontonamn"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
 
@@ -2936,9 +2852,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Bokföring"
 
@@ -2983,10 +2897,8 @@ msgid "Centralisation"
 msgstr "Centralisering"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3026,14 +2938,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Situation"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -3073,8 +2983,7 @@ msgid "Cancel selected invoices"
 msgstr "Makulera valda fakturor"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3097,28 +3006,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr "Referens till dokumentet som genererade denna faktura."
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Bas"
 
@@ -3128,8 +3032,7 @@ msgid "Model Name"
 msgstr "Modellnamn"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Övriga"
 
@@ -3139,15 +3042,13 @@ msgid "8"
 msgstr "8"
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Godkänna"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Radanmärkning"
 
@@ -3162,17 +3063,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3193,12 +3091,9 @@ msgid "By Date and Period"
 msgstr "Per datum och period"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Anteckningar"
@@ -3211,8 +3106,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3237,21 +3131,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kod"
 
@@ -3261,8 +3149,7 @@ msgid "Financial Management"
 msgstr "Redovisning"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Ingen"
@@ -3289,8 +3176,7 @@ msgid "Additionnal Information"
 msgstr "Ytterligare information"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Skattebenämning"
@@ -3367,8 +3253,7 @@ msgid "Partner Balance"
 msgstr "Företagsbalans"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3381,8 +3266,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3419,8 +3303,7 @@ msgid "Import invoice"
 msgstr "Importera faktura"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3436,8 +3319,7 @@ msgid "Invoice line"
 msgstr "Fakturarad"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Genväg"
 
@@ -3462,15 +3344,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3506,8 +3386,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3583,8 +3462,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3644,14 +3522,11 @@ msgstr ""
 "att visas på fakturor"
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sekvens"
@@ -3717,8 +3592,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3738,8 +3612,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Startdatum"
@@ -3777,8 +3650,7 @@ msgid "Unreconciled"
 msgstr "Oavstämd"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Anteckning"
 
@@ -3811,8 +3683,7 @@ msgid "Entry Sequence"
 msgstr "Början av nummerserie"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Avslutad"
 
@@ -3939,12 +3810,9 @@ msgid "Code/Date"
 msgstr "Kod/datum"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktiv"
@@ -3996,20 +3864,15 @@ msgid "Secondary Currency"
 msgstr "Valuta"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4040,8 +3903,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Verifikatrader"
 
@@ -4133,18 +3995,15 @@ msgid "Journal Column"
 msgstr "Journalkolumn"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Klar"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4157,8 +4016,7 @@ msgid "Periods"
 msgstr "Perioder"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4185,8 +4043,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4240,8 +4097,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4332,8 +4188,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4359,14 +4214,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Slutdatum"
 
@@ -4387,8 +4240,7 @@ msgid "Day of the Month"
 msgstr "Dag i månad"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Rader"
 
@@ -4406,8 +4258,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4467,14 +4318,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Stater"
 
@@ -4510,8 +4359,7 @@ msgstr "Startdatum"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Total"
 
@@ -4628,11 +4476,9 @@ msgstr "Validerade poster från fakturan"
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4727,12 +4573,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Ref."
 
@@ -4809,8 +4652,7 @@ msgid "Control Invoice"
 msgstr "Kontrollfaktura"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4837,8 +4679,7 @@ msgstr "Moms:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr "Total:"
@@ -4849,8 +4690,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4866,8 +4706,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Godkänn"
 
@@ -4882,8 +4721,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4901,8 +4739,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Leverantörsfaktura"
 
@@ -4912,22 +4749,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4989,8 +4820,7 @@ msgid "Reporting"
 msgstr "Rapportering"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -5021,8 +4851,7 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5072,14 +4901,12 @@ msgid "Paid invoice"
 msgstr "Betalade fakturor"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5120,8 +4947,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Domän"
 
@@ -5146,9 +4972,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5165,8 +4989,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Fakturarad"
 
@@ -5217,8 +5040,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Betalningar"
@@ -5264,12 +5086,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Utkast"
@@ -5296,8 +5115,7 @@ msgid "Are you sure ?"
 msgstr "Är du helt säker?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
@@ -5333,22 +5151,16 @@ msgid "Supplier Invoice Process"
 msgstr "Process för leverantörsfakturering"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Sida"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5364,8 +5176,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5388,8 +5199,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5433,8 +5243,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5445,8 +5254,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5454,12 +5262,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5503,11 +5308,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr "Fakturanummerserier som används i denna bok"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5549,8 +5351,7 @@ msgid "List of Accounts"
 msgstr "Kontolista"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5643,15 +5444,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -5695,8 +5492,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5778,8 +5574,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Kontant"
 
@@ -5819,8 +5614,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Återbetalning från leverantör"
 
@@ -5867,10 +5661,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5904,10 +5696,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr "Versamhetsåret som det visas på bildskärmen."
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5966,8 +5756,7 @@ msgstr "Ja"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 "Kryssa i här om användaren är behörig att stämma av poster för detta konto."
 
@@ -5975,3 +5764,331 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Beräkna inskrivningsdatum"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Objektkonton att stänga"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Konton sorterade efter sort"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 32872fcd294..ac517cd254a 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr ""
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1394,8 +1354,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr ""
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr ""
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2826,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr ""
 
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2955,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2978,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +3004,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +3014,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3035,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3063,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3103,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3121,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3148,7 @@ msgid "Additionnal Information"
 msgstr ""
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr ""
@@ -3339,8 +3225,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3238,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3275,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3291,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,15 +3316,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr ""
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3358,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3434,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3490,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3560,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3580,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3618,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3642,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3763,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr ""
@@ -3949,20 +3817,15 @@ msgid "Secondary Currency"
 msgstr ""
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3856,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3948,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3969,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3996,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4192,8 +4049,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4284,8 +4140,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4311,14 +4166,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4339,8 +4192,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4210,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4270,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4462,8 +4311,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4580,11 +4428,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4525,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4761,8 +4604,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4789,8 +4631,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4642,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4818,8 +4658,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4834,8 +4673,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,8 +4691,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4864,22 +4701,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4941,8 +4772,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4803,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5024,14 +4853,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5072,8 +4899,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5098,9 +4924,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5117,8 +4941,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr ""
 
@@ -5169,8 +4992,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5216,12 +5038,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5248,8 +5067,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5103,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5316,8 +5128,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5151,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5385,8 +5195,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,8 +5206,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5406,12 +5214,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5455,11 +5260,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5498,8 +5300,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5592,15 +5393,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5644,8 +5441,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,8 +5523,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5768,8 +5563,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5816,10 +5610,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5645,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5703,338 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 749b2fd0d65..833f2aeacbd 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Mutabakatsız girişler"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Temel Kod"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr "Bakiye"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr "Seçilen satırı taşı"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Giriş etiketi"
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr "Periyod Toplamı"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Kodu derle"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Hesap Kayıt satırı"
 
@@ -227,12 +221,9 @@ msgstr "tekrarlanan kayıtlar"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Miktar"
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Sabitlendi"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Vadesi Geçen Ödemeler"
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr "Dönem Seç"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Kaynak"
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr "delta borç"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "Vergi"
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr "Analiz hesabı"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr "Çocuk vergisi"
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Günlük adı"
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr "Karşı"
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Durum"
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Ödenmeyen tedarikçi iadesi"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Özel hesaplama"
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr "isk. %"
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Ref"
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr "Alt Toplam :"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr "Analiz için Dönem Seçiniz"
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr "Alan Adı"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr "Yevmiye Kayıt Yılı Bitişi"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr "Alış Özellikleri"
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr "Kalem Hareketleri Oluşturuldu."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Durum"
 
@@ -917,10 +888,8 @@ msgstr "Hesap Kartı Seç"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Adet"
@@ -963,16 +932,13 @@ msgstr "Fatura Analizi"
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr "Net Toplam:"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr "Mali Durum Şablonu"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Birim Fiyat"
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr "Mutabakatsız İşlemler"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr "Vergi Eşlemesi"
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Görünüm"
 
@@ -1394,8 +1354,7 @@ msgstr "Hesap Tipleri"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr "Yevmiye"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr "Ekstre Mutabakat Kalemi"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Masraf hesabında kullanmak için boş bırak"
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr "Mutabakat Hesabı"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Cari Kart"
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr "Alacak ve Borçlar Muhasebesi"
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Abonelik Kalemleri"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr "Dönem Süresi (Gün)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Yüzde"
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr "Hesap Planı Kartları"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipi"
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr "Yevmiye-Dönem Adı"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Vergi Servis Talep Adı"
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr "Geçmiş"
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Para Birimi"
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Vadesi Geçmiş Ödeme için Mesaj"
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr "Detay"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Konsolidasyon (Birleştirme)"
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Tarih"
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr "Mutabakatı Kaldır"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Vergi Tipi"
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr "Ekstre Kayıtları"
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr "Bitiş Tarihi"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr "Kayıt Kalemleri"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr ""
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "İptal"
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr "Hesap Tipi Adı"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr "Hukuki Dava"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Bilgi"
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr "Fiyat"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr "Fatura Referansı"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Adı"
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr "Tam Hesap Adı"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,9 +2826,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Muhasebe"
 
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Vergi Kodu"
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Döküman"
 
@@ -3045,8 +2955,7 @@ msgid "Cancel selected invoices"
 msgstr "Seçili Faturaları İptal Et"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2978,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Taslak olarak Ayarla"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "Borç (Ödenmesi Gereken)"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "Matrah"
 
@@ -3100,8 +3004,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr "Diğer Bilgiler"
 
@@ -3111,15 +3014,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Onayla"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Açıklama"
 
@@ -3134,17 +3035,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3063,9 @@ msgid "By Date and Period"
 msgstr "Dönem ve Tarihe göre"
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Notlar"
@@ -3183,8 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3103,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Kodu"
 
@@ -3233,8 +3121,7 @@ msgid "Financial Management"
 msgstr "Finansal Yönetim"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Yok"
@@ -3261,8 +3148,7 @@ msgid "Additionnal Information"
 msgstr "Ek Bilgi"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Vergi Adı"
@@ -3339,8 +3225,7 @@ msgid "Partner Balance"
 msgstr "Cari Bakiyesi"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3238,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3275,7 @@ msgid "Import invoice"
 msgstr "Faturayı Al"
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Oluştur"
@@ -3408,8 +3291,7 @@ msgid "Invoice line"
 msgstr "Fatura Kalemi"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Kısayol"
 
@@ -3434,15 +3316,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Asıl Vergi Hesabı"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3358,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3434,7 @@ msgid "Journal code"
 msgstr "Yevmiye Kodu"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Kayıtları Oluştur"
 
@@ -3612,14 +3490,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Sıra No"
@@ -3685,8 +3560,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Vade Tarihi"
 
@@ -3706,8 +3580,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr "Baş. Tarihi"
@@ -3745,8 +3618,7 @@ msgid "Unreconciled"
 msgstr "Mutabakatsız"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Not"
 
@@ -3770,8 +3642,7 @@ msgid "Entry Sequence"
 msgstr "Sıra No Girişi"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Kapalı"
 
@@ -3892,12 +3763,9 @@ msgid "Code/Date"
 msgstr "Kod/Tarih"
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Aktif"
@@ -3949,20 +3817,15 @@ msgid "Secondary Currency"
 msgstr "İkinci Para Birimi"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3856,7 @@ msgid "Account Move"
 msgstr "Hesap Hareketi"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Ekstre Kalemi"
 
@@ -4086,18 +3948,15 @@ msgid "Journal Column"
 msgstr "Yevmiye Kolonu"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Bitti"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3969,7 @@ msgid "Periods"
 msgstr "Dönemler"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3996,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Varsayılan Vergi"
 
@@ -4192,8 +4049,7 @@ msgstr "Tip Kontrolleri"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Hesap Adı"
 
@@ -4203,9 +4059,10 @@ msgid "Payment date"
 msgstr "Ödeme Tarihi"
 
 #. module: account
-#: wizard_button:account_use_models,create,end:0
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4284,8 +4141,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr "Dahili Tipi"
 
@@ -4311,14 +4167,12 @@ msgid "Posted"
 msgstr "Muhasebeleşti"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr "Alacak Dekontları"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
@@ -4339,8 +4193,7 @@ msgid "Day of the Month"
 msgstr "Ay Günü"
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4211,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4271,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Durumlar"
 
@@ -4462,8 +4312,7 @@ msgstr "Tarih Başlangıcı"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Toplam"
 
@@ -4580,11 +4429,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4526,9 @@ msgid "Print Aged Trial Balance"
 msgstr "Yaşlandırılmış Mizanı Yazdır"
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4761,8 +4605,7 @@ msgid "Control Invoice"
 msgstr "Fatura Kontrol Et"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Alacak"
@@ -4789,8 +4632,7 @@ msgstr "KDV :"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4643,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr "Hesap Eşlemesi"
@@ -4818,8 +4659,7 @@ msgid "Account Reconciliation"
 msgstr "Hesap Mutabakatı"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -4834,8 +4674,7 @@ msgid "Parent Account Template"
 msgstr "Ana Hesap Şablonu"
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,8 +4692,7 @@ msgid "Analytic account"
 msgstr "Analiz Hesabı"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Tedarikçi Faturası"
 
@@ -4864,22 +4702,16 @@ msgid "Valid"
 msgstr "Geçerli"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Borç"
@@ -4941,8 +4773,7 @@ msgid "Reporting"
 msgstr "Raporlama"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4804,7 @@ msgid "Configuration"
 msgstr "Ayarlar"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Toplam Tutar"
 
@@ -5024,14 +4854,12 @@ msgid "Paid invoice"
 msgstr "Fatura Ödendi"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5072,8 +4900,7 @@ msgid "With movements"
 msgstr "Hareketlerle Birlikte"
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr ""
 
@@ -5098,9 +4925,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5117,8 +4942,7 @@ msgid "Payable Accounts"
 msgstr "Satıcı Hesabı"
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Fatura Kalemi"
 
@@ -5169,8 +4993,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr "Ödemeler"
@@ -5216,12 +5039,9 @@ msgstr "Ödeme Tarihi ve Yevmiye Seç"
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Taslak"
@@ -5248,8 +5068,7 @@ msgid "Are you sure ?"
 msgstr "Emin misiniz ?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5104,16 @@ msgid "Supplier Invoice Process"
 msgstr "Tedarikçi Fatura Prosesi"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Sayfa"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Opsiyonel Bilgi"
 
@@ -5316,8 +5129,7 @@ msgid "Receivable and Payable"
 msgstr "Alacak ve Borç"
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5152,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Hesapla"
@@ -5385,8 +5196,7 @@ msgid "End of period"
 msgstr "Dönem Bitişi"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,8 +5207,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5406,12 +5215,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Bakiye"
@@ -5455,11 +5261,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Genel Bilgiler"
 
@@ -5498,8 +5301,7 @@ msgid "List of Accounts"
 msgstr "Hesap Listesi"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr "Satış Özellikleri"
 
@@ -5592,15 +5394,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Açıklama"
 
@@ -5644,8 +5442,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Servis Talep Kodu"
 
@@ -5726,11 +5523,9 @@ msgid "Models Definition"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Nakit"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -5768,8 +5563,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Tedarikçi İade Faturası"
 
@@ -5816,10 +5610,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5645,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5703,340 @@ msgstr "Evet"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Giriş Tarihlerini Hesapla"
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Çözümleyici hesabı kapat"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Taslak Faturlar"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Hesap Panosu"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Hesapları faturala"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Maliyetleri faturala"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Eski Alacaklar"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Gelir Hesapları"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Göstergelerim"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Yaşlandırılmış Gelir"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Borç/Kredi Bilgisini Göster"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Tüm hesaplar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Bildirim"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Mali Dönem"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Hesap bakiyesi"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Dönem(leri) Seç"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Oran"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Hesap Bakiyesi (Yıl Karşılaştırma)"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Toplam :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Dönem seçin"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Rapor Seçenekleri"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Hsapları Göster"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "En fazla 3 yıl seçebilirsiniz. Lütfen tekrar kontrol edin."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+"Aşağıdaki hataları yapmış olabilirsiniz. Lütfen bunları düzeltin ve tekrar "
+"deneyin."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Oluşturulma Tarihi"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "En az 1 Mali Yıl seçmelisiniz. Tekrar deneyin."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Raporu Yapılandır"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Toplam Tutar"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Bugüne kadarki Yaşlandırılmış Alacak"
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Alıcılar Hesabı"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Hesap Tipi Bazında Bakiye"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Yıl:Hafta"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Tarih Oluştur"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "Yaşlandırılmış Alacak"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Tutar"
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index eb7a2eab3ca..e5893eee977 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr "Невивірені проводки"
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr "Базовий код"
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr "Залишковий"
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr "Перемістити вибраний рядок"
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Мітка запису"
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr "Сума періоду"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "Код розрахунку (якщо тип=код)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr "Рядок проводки за рахунком"
 
@@ -227,12 +221,9 @@ msgstr "Періодичні Записи"
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Сума"
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr "Фіксований"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr "Прострочені Платежі"
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr "Вибрати період"
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr "Походження"
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr "ПДВ"
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr "Аналітичний рахунок"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr "Назва журналу"
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr "Стан"
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr "Неоплачені Повернення Постачальникові"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr "Спеціальний розрахунок"
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Посилання"
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr "Назва поля"
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr "Ознака власника"
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr "Журнал Проводок з Закриття Року"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr "Перемістити Створені Рядки."
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr "Статус"
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr "Кількість"
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1118,8 +1083,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ціна за одиницю"
 
@@ -1272,8 +1236,7 @@ msgid "Not reconciled transactions"
 msgstr "Незвірені операції"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1295,8 +1258,7 @@ msgid "Write-Off account"
 msgstr "Рахунок списання"
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr "Модель"
 
@@ -1322,11 +1284,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr "Перегляд"
 
@@ -1397,8 +1357,7 @@ msgstr "Типи рахунків"
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1414,8 +1373,7 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1441,8 +1399,7 @@ msgid "Statement reconcile line"
 msgstr "Рядок виписки вивірки"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr "Залишити порожнім для використання рахунку доходу"
 
@@ -1569,8 +1526,7 @@ msgid "Account n°"
 msgstr "№ рахунку"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr "Залишити порожнім для використання рахунку витрат"
 
@@ -1580,8 +1536,7 @@ msgid "Account to reconcile"
 msgstr "Рахунок до звірки"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr "Партнер"
@@ -1593,14 +1548,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr "Рядки підписки"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1764,8 +1717,7 @@ msgid "Period length (days)"
 msgstr "Тривалість періоду (днів)"
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr "Процент"
@@ -1776,8 +1728,7 @@ msgid "Charts"
 msgstr "Плани рахунків"
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1851,12 +1802,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "Тип"
 
@@ -2004,8 +1952,7 @@ msgid "Journal-Period Name"
 msgstr "Журнал-Назва періоду"
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Назва податку події"
 
@@ -2020,8 +1967,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2094,10 +2040,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr "Валюта"
@@ -2135,8 +2079,7 @@ msgid "Analytic Entry"
 msgstr "Проводка аналітики"
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2188,8 +2131,7 @@ msgid "Detail"
 msgstr "Деталізований"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr "Консолідація"
 
@@ -2284,21 +2226,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr "Дата"
@@ -2315,8 +2252,7 @@ msgid "Unreconcile"
 msgstr "Відмінити звірку"
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr "Тип податку"
 
@@ -2326,8 +2262,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr "Користувач"
 
@@ -2413,8 +2348,7 @@ msgid "Date End"
 msgstr "Кінцева дата"
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2422,8 +2356,7 @@ msgid "Entry Lines"
 msgstr "Рядки проводок"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "Придатний код (якщо тип=код)"
 
@@ -2512,11 +2445,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2535,8 +2466,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr "Скасувати"
 
@@ -2546,10 +2476,8 @@ msgid "Acc. Type Name"
 msgstr "Назва типу рахунку"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2563,8 +2491,7 @@ msgid "Litigation"
 msgstr "Спірний"
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr "Інформація"
@@ -2674,8 +2601,7 @@ msgid "Price"
 msgstr "Ціна"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr "-"
@@ -2742,17 +2668,13 @@ msgid "Invoice Reference"
 msgstr "Посилання на інвойс"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "Назва"
@@ -2792,8 +2714,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2886,16 +2807,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2916,9 +2832,7 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: view:product.product:0 view:product.template:0 view:res.partner:0
 msgid "Accounting"
 msgstr "Бухгалтерський облік"
 
@@ -2963,10 +2877,8 @@ msgid "Centralisation"
 msgstr "Централізація"
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr "Код податку"
@@ -3009,14 +2921,12 @@ msgstr ""
 "терміном оплати партнера."
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr "Ситуативний"
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr "Документ"
 
@@ -3054,8 +2964,7 @@ msgid "Cancel selected invoices"
 msgstr "Відмінити вибрані інвойси"
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3078,28 +2987,23 @@ msgid "("
 msgstr "("
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "Як чорновик"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr "До сплати"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr "База"
 
@@ -3109,8 +3013,7 @@ msgid "Model Name"
 msgstr "Назва моделі"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3120,15 +3023,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr "Провірити"
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr "Легенда"
 
@@ -3143,17 +3044,14 @@ msgid "account.move.line.select"
 msgstr "account.move.line.select"
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3174,12 +3072,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr "Примітки"
@@ -3192,8 +3087,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3218,21 +3112,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr "Код"
 
@@ -3242,8 +3130,7 @@ msgid "Financial Management"
 msgstr "Фінанси"
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr "Немає"
@@ -3270,8 +3157,7 @@ msgid "Additionnal Information"
 msgstr "Додаткова інформація"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "Назва податку"
@@ -3348,8 +3234,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3362,8 +3247,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3402,8 +3286,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr "Створити"
@@ -3419,8 +3302,7 @@ msgid "Invoice line"
 msgstr "Рядок інвойса"
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr "Скорочено"
 
@@ -3447,15 +3329,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "Податковий рахунок власника"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3491,8 +3371,7 @@ msgid "Central Journal"
 msgstr "Основний журнал"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr "Перенесене сальдо"
 
@@ -3568,8 +3447,7 @@ msgid "Journal code"
 msgstr "Код журналу"
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr "Створити записи"
 
@@ -3625,14 +3503,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr "Послідовність"
@@ -3698,8 +3573,7 @@ msgstr "Підписка на рахунки"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr "Дата проведення"
 
@@ -3719,8 +3593,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3758,8 +3631,7 @@ msgid "Unreconciled"
 msgstr "Незвірений"
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr "Примітка"
 
@@ -3783,8 +3655,7 @@ msgid "Entry Sequence"
 msgstr "Послідовність записів"
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr "Закрито"
 
@@ -3905,12 +3776,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "Діючий"
@@ -3962,20 +3830,15 @@ msgid "Secondary Currency"
 msgstr "Друга валюта"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -4008,8 +3871,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr "Рядки банківської виписки"
 
@@ -4103,18 +3965,15 @@ msgid "Journal Column"
 msgstr "Колонка журналу"
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr "Завершено"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4127,8 +3986,7 @@ msgid "Periods"
 msgstr "Періоди"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4155,8 +4013,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr "Типові податки"
 
@@ -4212,8 +4069,7 @@ msgstr "Контроль типів"
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr "Назва рахунку"
 
@@ -4304,8 +4160,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4331,14 +4186,12 @@ msgid "Posted"
 msgstr "Введений"
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4359,8 +4212,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr "Рядки"
 
@@ -4378,8 +4230,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Податкова декларація"
 
@@ -4439,14 +4290,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr "Стани"
 
@@ -4482,8 +4331,7 @@ msgstr "Початкова дата"
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr "Разом"
 
@@ -4600,11 +4448,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4701,12 +4547,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr "Пос."
 
@@ -4756,10 +4599,9 @@ msgid "Account cost and revenue by journal (This Month)"
 msgstr "Видатки та доходи рахунку за журналом (цей місяць)"
 
 #. module: account
-#: selection:account.partner.balance.report,init,result_selection:0
-#: selection:account.third_party_ledger.report,init,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Рахунки дебіторів"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
@@ -4783,8 +4625,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr "Дебітори"
@@ -4811,8 +4652,7 @@ msgstr "ПДВ:"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4823,8 +4663,7 @@ msgid "account.analytic.journal"
 msgstr "account.analytic.journal"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4840,8 +4679,7 @@ msgid "Account Reconciliation"
 msgstr "Звірка рахунку"
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr "Затвердити"
 
@@ -4856,8 +4694,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4878,8 +4715,7 @@ msgid "Analytic account"
 msgstr "Аналітичний рахунок"
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr "Інвойс постачальника"
 
@@ -4889,22 +4725,16 @@ msgid "Valid"
 msgstr "Дійсний"
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr "Дебет"
@@ -4966,8 +4796,7 @@ msgid "Reporting"
 msgstr "Звіти"
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr "/"
 
@@ -4998,8 +4827,7 @@ msgid "Configuration"
 msgstr "Налаштування"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr "Разом"
 
@@ -5049,14 +4877,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr "Визначення податку"
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr "Податкова група"
 
@@ -5097,8 +4923,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "Область"
 
@@ -5123,9 +4948,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5142,8 +4965,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "Рядок інвойса"
 
@@ -5194,8 +5016,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5241,12 +5062,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr "Чорновик"
@@ -5273,8 +5091,7 @@ msgid "Are you sure ?"
 msgstr "Ви впевнені?"
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr "ПРО-ФОРМА"
 
@@ -5310,22 +5127,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr "Додаткова інформація"
 
@@ -5341,8 +5152,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ":"
 
@@ -5365,8 +5175,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr "Розрахувати"
@@ -5410,8 +5219,7 @@ msgid "End of period"
 msgstr "Кінець періоду"
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr "Запис рахунку"
 
@@ -5422,8 +5230,7 @@ msgid "General Journal"
 msgstr "Загальний журнал"
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5431,12 +5238,9 @@ msgstr "Загальний журнал"
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr "Сальдо"
@@ -5480,11 +5284,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr "Загальне"
 
@@ -5523,8 +5324,7 @@ msgid "List of Accounts"
 msgstr "Список Рахунків"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5617,15 +5417,11 @@ msgstr "Внутрішні"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr "Опис"
 
@@ -5669,8 +5465,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr "Код події"
 
@@ -5752,8 +5547,7 @@ msgstr "Визначення моделей"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr "Каса"
 
@@ -5793,8 +5587,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr "Повернення постачальнику"
 
@@ -5841,10 +5634,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5878,10 +5669,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5938,8 +5727,7 @@ msgstr "Так"
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
@@ -5947,25 +5735,349 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Розрахувати дати проводок"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Аналітичні рахунки до закриття"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Чорновики інвойсів"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Панель бухгалтерії"
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Рахунки для інвойсування"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Кошти для інвойсування"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Застаріла дебіторська заборгованість"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Рухунки доходів"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Мої індикатори"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Застарілі доходи"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Рахунки за типом"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Рахунки дебіторів"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "Баланс за типом рахунку"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Тиждень року"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #~ msgid "Keep empty to use the period of the validation date."
 #~ msgstr "Залиште порожнім, щоб використовувати період дати затвердження"
 
 #~ msgid "Error! You can not create recursive account."
 #~ msgstr "Помилка! Ви не можете створити рекурсивний рахунок."
 
-#, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Помилка Цілісності !"
 
-#, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "Ви повинні вказати рахунок для запису !"
 
-#, python-format
 #~ msgid "Warning !"
 #~ msgstr "Попередження !"
 
-#, python-format
 #~ msgid "No analytic journal !"
 #~ msgstr "Немає  аналітичного журналу !"
 
@@ -5974,26 +6086,22 @@ msgstr "Розрахувати дати проводок"
 
 #~ msgid ""
 #~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
+#~ "consider the present one as void. Do not hesitate to contact our "
+#~ "accounting departement at +32 81 81 37 00."
 #~ msgstr ""
-#~ "Будь ласка, не беріть це до уваги, якщо Ваш платіж вже пройшов після того, "
-#~ "як Ви отримали це повідомлення. У разі виникнення питань зв'яжіться з нашою "
-#~ "бухгалтерією за тел. +32 81 81 37 00."
+#~ "Будь ласка, не беріть це до уваги, якщо Ваш платіж вже пройшов після "
+#~ "того, як Ви отримали це повідомлення. У разі виникнення питань зв'яжіться "
+#~ "з нашою бухгалтерією за тел. +32 81 81 37 00."
 
-#, python-format
 #~ msgid "Bank Journal "
 #~ msgstr "Банківський Журнал "
 
-#, python-format
 #~ msgid "You can not add/modify entries in a closed journal."
 #~ msgstr "Ви не можете додати/змінити записи в закритому журналі."
 
-#, python-format
 #~ msgid "You must first select a partner !"
 #~ msgstr "Ви повинні спочатку вибрати партнера !"
 
-#, python-format
 #~ msgid "Sales Journal"
 #~ msgstr "Журнал продажів"
 
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 7dba566772d..ab7884cfa0a 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-22 22:56+0000\n"
-"Last-Translator: sagas <sagas@163.com>\n"
+"PO-Revision-Date: 2010-07-06 03:17+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "未支付的采购发票"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "凭证录入"
+msgstr "分录"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -55,7 +55,7 @@ msgstr "资产"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -72,12 +72,12 @@ msgstr "选择消息"
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr "这科目将用于当前产品分类的销售收入科目"
+msgstr "这科目将用于当前产品分类的默认进仓"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "此处留空则使用发票确认的日期"
+msgstr "留空使用确认(发票)日期的会计期间"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -87,7 +87,7 @@ msgstr "对账结果"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "未对账凭证"
+msgstr "未对账"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -115,7 +115,7 @@ msgstr "上级科目"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "日记账凭证"
+msgstr "原始凭证分录集合"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -134,7 +134,7 @@ msgstr "税基代码符号"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr "选择未对账凭证"
+msgstr "未对账"
 
 #. module: account
 #: constraint:account.period:0
@@ -149,7 +149,7 @@ msgstr "错误!这会计期间无效 "
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -167,7 +167,7 @@ msgid ""
 "Day of the month, set -1 for the last day of the current month. If it's "
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
-msgstr "某月第几日，如果是本月的最后一天则设置-1。如果是正数，则指定下个月的日期。净日数设置0（否则将基于本月第一天）。"
+msgstr "月天数设为-1到当月最后一天.如果为+数为下月的天数.设为0为净天数(否则从月初开始算)"
 
 #. module: account
 #: view:account.move:0
@@ -177,7 +177,7 @@ msgstr "贷方合计"
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -190,7 +190,7 @@ msgstr "选择凭证行"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr "凭证标签"
+msgstr "分录标签"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -212,7 +212,7 @@ msgstr "计算代码(如果类型=代码)"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "凭证明细"
+msgstr "分录"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -222,7 +222,7 @@ msgstr "账龄试算平衡表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr "周期性凭证"
+msgstr "周期性分录"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -257,7 +257,7 @@ msgstr "借方合计"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "凭证 -"
+msgstr "分录 -"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -266,7 +266,7 @@ msgid ""
 "view tell Open ERP which fields should be visible, required or readonly and "
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
-msgstr "给出分类帐的凭证浏览和写入的视图.这视图规定系统那个字段可见、必须或只读.你能为每个分类帐创建你自己的视图"
+msgstr "给出分录集合中分录的浏览和写入视图. 这视图告诉系统那个字段可见,必须或只读. 你能为每个分录集合创建自己的视图."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -277,9 +277,8 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果你使用付款条件，到期日期将在生成会计分录时自动计算。如果付款条件和到期日\r\n"
-"期为空，则意味着直接付款。使用付款条件可能计算出几个到期日，例如现在先付50%，然\r\n"
-"后在一个月内支付余下的50%。"
+"如果你使用付款条款, 到期将自动生成会计分录.  如果付款条款和到期日期为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如现在先付50%, "
+"然后在一个月内支付余下的50%."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -323,7 +322,7 @@ msgstr "参考"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr "周期性计算"
+msgstr "周期性分录计算"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -353,20 +352,20 @@ msgstr "借方交易"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "子税"
+msgstr "基于子税"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "分类帐名称"
+msgstr "分录集合名称"
 
 #. module: account
 #: view:account.payment.term:0
@@ -376,7 +375,7 @@ msgstr "发票说明"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误!你不能创建递归的辅助核算项目"
+msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -398,17 +397,17 @@ msgstr "允许取消分录"
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr "付款对帐"
+msgstr "付款对账"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr "费用日记账"
+msgstr "费用分录集合"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "所有分析分录"
+msgstr "所有辅助核算分录"
 
 #. module: account
 #: rml:account.overdue:0
@@ -488,23 +487,23 @@ msgstr "税用在"
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr "在下一个税额计算前，如果本税额必须包含在税基里，请设置"
+msgstr "如果这税额必须包含在计算下一个税的基础金额里, 请设置"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr "期间处理"
+msgstr "定期处理"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "辅助核算凭证统计"
+msgstr "辅助核算分录统计"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "税务模板"
+msgstr "税代码模板"
 
 #. module: account
 #: view:account.invoice:0
@@ -515,7 +514,7 @@ msgstr "供应商发票"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "对账的付款"
+msgstr "对账支付"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -541,7 +540,7 @@ msgstr "递延方法"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "基础金额"
+msgstr "包含在基础金额里"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -557,20 +556,20 @@ msgstr "明细"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr "成本分类账或凭证名称"
+msgstr "成本分录集合或凭证名称"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "真"
+msgstr "Tue"
 
 #. module: account
 #: help:account.payment.term.line,days:0
 msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
-msgstr "天数在计算前加入月的天数,如日期为01/15,天数是22,月是1,则应付日期是02/28"
+msgstr "在计算前加入的天数, 如日期为01/15, 天数是22, 月是1,则应付日期是02/28"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -596,20 +595,20 @@ msgstr "账龄分析表"
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr "凭证控制"
+msgstr "分录控制"
 
 #. module: account
 #: help:account.model.line,sequence:0
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
-msgstr "这序列字段使用从高到低排序"
+msgstr "这序列字段使用从低到高排序"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr "留空为打开当前状况"
+msgstr "(留空为打开当前状况)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -625,17 +624,17 @@ msgstr "联系"
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "业务伙伴付款条件"
+msgstr "业务伙伴付款条款"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "凭证对账"
+msgstr "分录对账"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr "打开银行对账"
+msgstr "开始银行对账"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -656,7 +655,7 @@ msgstr "如果这会计年度属于几个公司留空"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "成本会计"
+msgstr "辅助核算会计"
 
 #. module: account
 #: rml:account.overdue:0
@@ -669,7 +668,7 @@ msgstr "小计 :"
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr "辅助核算凭证"
+msgstr "辅助核算分录"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -694,7 +693,7 @@ msgstr "客户退款"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Select the Period for Analysis"
-msgstr "选择核算会计期间"
+msgstr "选择辅助核算的会计期间"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -738,7 +737,7 @@ msgstr "上级符号"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "年度期末分类帐"
+msgstr "结束会计年度分录集合"
 
 #. module: account
 #: view:product.product:0
@@ -759,7 +758,7 @@ msgstr "部分支付"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr "创建凭证明细"
+msgstr "创建的凭证明细"
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -785,7 +784,7 @@ msgstr "业务伙伴科目"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr "之前生成的凭证:"
+msgstr "之前生成的分录:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -812,14 +811,14 @@ msgstr "凭证明细"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr "辅助核算项目统计"
+msgstr "科目成本与收益的分录集合"
 
 #. module: account
 #: help:account.account.template,user_type:0
 msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
-msgstr "这定义的类型根据你的国家.这类型包含更多的信息如:科目和特定的信息"
+msgstr "这些类型的定义根据你的国家. 在类型上包含更多的信息: 科目和它的特点."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -841,14 +840,14 @@ msgstr "科目模板"
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr "打印分类帐"
+msgstr "打印分录集合"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -869,18 +868,18 @@ msgstr "取消发票"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "必须的"
+msgstr "必需"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "采购科目"
+msgstr "费用科目"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr "补差额分类帐"
+msgstr "补差额分录集合"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
@@ -903,7 +902,7 @@ msgstr "新的会计年度"
 msgid ""
 "If a default tax is given in the partner it only overrides taxes from "
 "accounts (or products) in the same group."
-msgstr "如果默认税提供这业务伙伴的税只决定税来自科目(或产品)相同的分组"
+msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
 
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -913,7 +912,7 @@ msgstr "打开会计年度"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "选择科目表"
+msgstr "选择科目一览表"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -944,7 +943,7 @@ msgstr "基础代码金额"
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "这分类帐的责任用户"
+msgstr "这分录集合用户负责"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -955,12 +954,12 @@ msgstr "默认借方科目"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "银行对账单"
+msgstr "银行对帐单"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr "核算发票"
+msgstr "辅助核算发票"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -984,7 +983,7 @@ msgstr "会计期间"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr "合计"
+msgstr "总计"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -1064,7 +1063,7 @@ msgstr "主序列"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr "打印辅助核算分类帐"
+msgstr "打印辅助核算分录集合"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1076,7 +1075,7 @@ msgstr "原始凭证编号"
 msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
-msgstr "序列字段用于付款条款行的排序从低到高."
+msgstr "这序列字段用于付款条款的从低到高排序."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
@@ -1100,7 +1099,7 @@ msgstr "税代码"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "列表模板"
+msgstr "一览表模板"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -1111,7 +1110,7 @@ msgstr "收入类科目"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "新的辅助核算项目"
+msgstr "新辅助核算项"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1138,7 +1137,7 @@ msgstr "向导.多.一览表.科目"
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr "销售日记账"
+msgstr "销售分录集合"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1165,7 +1164,7 @@ msgstr "税务报表"
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr "打开科目表"
+msgstr "打开一览表"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -1175,7 +1174,7 @@ msgstr "你确定关闭这个会计年度?"
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr "银行收入"
+msgstr "银行收据"
 
 #. module: account
 #: view:res.partner:0
@@ -1195,7 +1194,7 @@ msgstr "进项发票"
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr "标准凭证"
+msgstr "普通分录"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1206,7 +1205,7 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"这将选择将要兑换的当前计算汇率.在大多数国家法定为\"平均\"但只有少数软件系统能够管理.所以如果你导入另一个软件系统,你可能需要使用当日汇率"
+"这将选择将要兑换的当前货币汇率. 在大多数国家法定为\"平均\"但只有少数软件系统能够管理.  所以如果你导入另一个软件系统,你可能需要使用当日汇率."
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1221,7 +1220,7 @@ msgstr "财务结构模板科目一览"
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr "上级辅助核算项目"
+msgstr "上级辅助核算项"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1246,7 +1245,7 @@ msgstr "期末结余"
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "购置税"
+msgstr "采购税"
 
 #. module: account
 #: field:account.payment.term.line,name:0
@@ -1272,7 +1271,7 @@ msgstr "部分对账"
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "没对账的业务"
+msgstr "没对账的交易"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1284,7 +1283,7 @@ msgstr "税一览"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr "继续"
+msgstr "下一步"
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -1356,7 +1355,7 @@ msgstr "税金的计算方法"
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr "审核凭证"
+msgstr "确认分录"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1364,7 +1363,7 @@ msgstr "审核凭证"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "如果进行未对账处理你必须检验处理的所有操作.因为他们不会被禁止."
+msgstr "如果进行未对账交易, 你必须检验交易的所有操作. 因为他们不会被禁止."
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -1412,7 +1411,7 @@ msgstr "科目类型"
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr "分类帐"
+msgstr "分录集合"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -1423,7 +1422,7 @@ msgstr "子科目"
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr "显示日志"
+msgstr "显示历史"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
@@ -1439,7 +1438,7 @@ msgstr "显示科目 "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "对账单对账明细"
+msgstr "对帐单核销明细"
 
 #. module: account
 #: view:account.tax:0
@@ -1461,8 +1460,8 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
-"合作者用于付款的银行帐\n"
-"留空代表默认值"
+"付款时业务伙伴的银行帐号\n"
+"留空使用默认值"
 
 #. module: account
 #: field:res.partner,debit:0
@@ -1482,12 +1481,12 @@ msgstr "向导.公司.设置"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr "项目.辅助核算.明细.延伸"
+msgstr "项.辅助核算.明细.延伸"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "退款分类帐"
+msgstr "退款分录集合"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -1497,7 +1496,7 @@ msgstr "收入"
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr "供货商"
+msgstr "供应商"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1519,13 +1518,13 @@ msgstr "正数"
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr "打印普通分类帐"
+msgstr "打印普通日记帐"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1537,12 +1536,12 @@ msgstr "发票进展"
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "从模板产生科目表"
+msgstr "从模板产生科目一览表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr "法定报表"
+msgstr "正规报表"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1558,7 +1557,7 @@ msgstr "打开对账"
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr "开始日记账"
+msgstr "分录集合开启"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -1575,7 +1574,7 @@ msgstr "科目编码"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "留空为使用采购科目"
+msgstr "留空为使用费用科目"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
@@ -1599,7 +1598,7 @@ msgstr "应收款与应付款科目"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "周期明细"
+msgstr "周期性分录明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1628,7 +1627,7 @@ msgstr "关闭会计期间"
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr "应付"
+msgstr "到期"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -1638,7 +1637,7 @@ msgstr "第三方"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "科目类型允许(留空为为不限制)"
+msgstr "科目类型允许(留空为不限制)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -1651,7 +1650,7 @@ msgstr "开始余额"
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr "分类帐"
+msgstr "分录集合"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -1708,12 +1707,12 @@ msgstr "重开"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr "你确定创建凭证?"
+msgstr "你确定创建分录?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr "含基本金额"
+msgstr "包含在基本金额里"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1724,7 +1723,7 @@ msgstr "第三贷方"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "凭证转为未对账"
+msgstr "未对账分录"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1734,13 +1733,13 @@ msgstr "控制预先生成发票"
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr "会计期间的成本分类账"
+msgstr "成本分类账的会计期间"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "新银行对账单"
+msgstr "新银行对帐单"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1752,14 +1751,14 @@ msgstr "从"
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr "发票和付款的对账凭证"
+msgstr "发票和付款的对账分录"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr "打印分类帐(按科目)"
+msgstr "打印主要的分录集合"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1776,7 +1775,7 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "科目列表"
+msgstr "一览表"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1807,7 +1806,7 @@ msgstr "日期或者代码"
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "项目管理员"
+msgstr "科目管理员"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -1850,7 +1849,7 @@ msgstr "开始日期"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x 费用贷方票据分类帐"
+msgstr "x 费用信用票据分录集合"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1866,7 +1865,7 @@ msgstr "类型"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr "科目允许(留空为为不限制)"
+msgstr "科目允许(留空为不限制)"
 
 #. module: account
 #: view:account.invoice:0
@@ -1882,7 +1881,7 @@ msgstr "发票税科目"
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "辅助核算凭证明细"
+msgstr "辅助核算明细"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
@@ -1893,7 +1892,7 @@ msgstr "支付发票"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr "错误：无效的Bvr号（错误的检验和）"
+msgstr "错误：无效的Bvr号(合计检查错误)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -1904,7 +1903,7 @@ msgstr "客户发票草稿"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "科目周期明细"
+msgstr "周期性分录明细的科目"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1932,7 +1931,7 @@ msgstr "排序按:"
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr "待审核"
+msgstr "待确认"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -1952,12 +1951,12 @@ msgstr "转移"
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr "在诉讼中"
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: help:account.tax,name:0
@@ -1983,7 +1982,7 @@ msgstr "          开始日期"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr "辅助核算分类帐报表"
+msgstr "辅助核算分录集合报表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -1999,12 +1998,12 @@ msgstr "税金额"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "成本分类账或凭证名称"
+msgstr "成本分录集合/凭证名称"
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "分类帐-会计期间名称"
+msgstr "分录集合 - 会计期间名称"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2018,7 +2017,7 @@ msgid ""
 "Check this box if you don't want new account moves to pass through the "
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
-msgstr "如果你不想新的凭证从草稿状态来生成而是直接通过手动确认到已审核状态"
+msgstr "勾选此项, 如果你不想新的凭证从草稿状态生成而是直接通过手动确认到已登记状态."
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2037,7 +2036,7 @@ msgstr "业务伙伴"
 msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
-msgstr "发票创建时自动计算唯一的发票编号"
+msgstr "发票创建时自动计算出唯一的发票编号"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2072,14 +2071,14 @@ msgstr "财务结构备注:"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr "会计期间开账凭证"
+msgstr "会计期间的开账分录"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
 #: model:ir.ui.menu,name:account.menu_validate_account_moves
 msgid "Validate Account Moves"
-msgstr "审核凭证"
+msgstr "确认凭证"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -2119,13 +2118,13 @@ msgstr "付款对账"
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr "对账单对账"
+msgstr "对帐单对帐"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr "新周期性凭证"
+msgstr "新周期性分录"
 
 #. module: account
 #: view:account.payment.term:0
@@ -2135,7 +2134,7 @@ msgstr "计算"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "辅助核算凭证"
+msgstr "辅助核算分录"
 
 #. module: account
 #: view:res.company:0
@@ -2152,12 +2151,12 @@ msgstr "税一览表"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr "计算金额"
+msgstr "金额"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "对账的凭证"
+msgstr "对账分录"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -2172,7 +2171,7 @@ msgstr "创建季度"
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "(留空为表示当前会计期间)"
+msgstr "(留空使用当前会计期间)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
@@ -2221,23 +2220,23 @@ msgstr "增值税 :"
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr "x 支票分类帐"
+msgstr "x 支票分录集合"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr "创建周期性凭证"
+msgstr "创建周期性分录"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "分类帐开账凭证"
+msgstr "分录集合开账分录"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -2252,7 +2251,7 @@ msgstr "客户税"
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr "开票日期"
+msgstr "发票日期"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2323,7 +2322,7 @@ msgstr "税类型"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "凭证"
+msgstr "项"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2340,12 +2339,12 @@ msgstr "科目模板"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目表模板"
+msgstr "科目一览表模板"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr "退款日记账"
+msgstr "退款分录集合"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -2361,12 +2360,12 @@ msgstr "自动对账"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr "进项发票"
+msgstr "导入发票"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr "和分类帐"
+msgstr "和分录集合"
 
 #. module: account
 #: view:account.tax:0
@@ -2388,19 +2387,19 @@ msgstr "科目No"
 msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
-msgstr "设置如果税计算是基于子税而不是合计"
+msgstr "如果税计算是基于子税而不是总金额, 设置它"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr "分类帐代码"
+msgstr "分录集合代码"
 
 #. module: account
 #: help:account.tax,applicable_type:0
 msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
-msgstr "税将不显示在这发票"
+msgstr "如果不适用(计算是通过python代码), 税将不显示在发票上"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -2419,7 +2418,7 @@ msgstr "结束日期"
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "凭证明细"
+msgstr "分录明细"
 
 #. module: account
 #: view:account.tax:0
@@ -2430,7 +2429,7 @@ msgstr "适用代码(如果类型=代码)"
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr "打开分类帐"
+msgstr "打开分录集合"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2443,12 +2442,12 @@ msgstr "KI"
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr "凭证"
+msgstr "分录明细"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr "列出所有税款必须安装这向导"
+msgstr "这向导列出所有必须安装的税"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2461,7 +2460,7 @@ msgstr "会计期间从"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "银行对账单"
+msgstr "银行对帐单"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2473,12 +2472,12 @@ msgstr "附加信息"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr "凭证对账"
+msgstr "分录对账"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "分类帐使用货币的金额"
+msgstr "分录集合使用货币的金额"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2489,7 +2488,7 @@ msgstr "横向模式"
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "从辅助核目项目创建发票"
+msgstr "从辅助核算项创建发票"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2577,12 +2576,12 @@ msgstr "税务报表"
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "应付账款"
+msgstr "应付账"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "对账单里的进项发票"
+msgstr "在银行对帐单里导入发票"
 
 #. module: account
 #: view:account.invoice:0
@@ -2603,7 +2602,7 @@ msgstr "付款单"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "允许要对账凭证在这科目"
+msgstr "勾选此项, 如果你想用户在这科目对账分录."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2626,7 +2625,7 @@ msgstr "资产净值"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr "付款信息"
+msgstr "逾期付款信息"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2647,23 +2646,22 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
-"这类型是用于特殊类型的不同类型.在系统中:视图能不显示所有条目.合并科目能合并多公司的子科目.业务伙伴的应收/应付账款科目(为借方贷方计算).关闭弃用科目"
-"."
+"这类型在系统中和特效一起用于不同的类型: 视图不能有记录. 合并科目能有多公司合并的子科目, 应收/应付的科目(为计算借方/贷方). 关闭弃用科目."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr "期末结账"
+msgstr "结束会计年度处理"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr "普通报表"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr "强制"
+msgstr "幂"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
@@ -2673,7 +2671,7 @@ msgstr "辅助核算明细分析"
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr "价格"
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2694,17 +2692,17 @@ msgstr "asgfas"
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr "辅助核算项目表"
+msgstr "辅助核算项一览表"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr "辅助科目核算明细视图"
+msgstr "辅助核算明细视图"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr "选择会计期间和分类帐确认样"
+msgstr "选择会计期间和确认分录集合"
 
 #. module: account
 #: field:account.invoice,number:0
@@ -2714,7 +2712,7 @@ msgstr "发票号"
 #. module: account
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr "期末日期"
+msgstr "结束会计期间"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2730,7 +2728,7 @@ msgstr "未完税"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr "反向核算余额"
+msgstr "反向辅助核算余额"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -2763,7 +2761,7 @@ msgstr "名称"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr "对账处理"
+msgstr "对账交易"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
@@ -2791,7 +2789,7 @@ msgid ""
 "The sequence field is used to order the taxes lines from lower sequences to "
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
-msgstr "序列字段用于税明细的排序从低到高.如果税中有子税这排序是重要的"
+msgstr "序列字段用于税从低到高排序, 如果税中有子税这排序是重要的"
 
 #. module: account
 #: field:account.journal.column,view_id:0
@@ -2799,7 +2797,7 @@ msgstr "序列字段用于税明细的排序从低到高.如果税中有子税
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "分类帐视图"
+msgstr "分录集合视图"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2814,7 +2812,7 @@ msgstr "客户参考:"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr "业务员伙伴ID"
+msgstr "业务伙伴ID"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2854,7 +2852,7 @@ msgstr "最好的祝愿"
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr "辅助核算成本和收入"
+msgstr "辅助核算项成本和收入"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -2869,7 +2867,7 @@ msgstr "待处理状态"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Created Entries"
-msgstr "跳过'草稿'状态创建凭证"
+msgstr "跳过'草稿'状态创建分录"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -2880,7 +2878,7 @@ msgstr "税科目"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "从报表创建凭证"
+msgstr "从对账单创建分录"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -2905,7 +2903,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr "采购退款草稿"
+msgstr "供应商退款草稿"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -2915,7 +2913,7 @@ msgstr "会计报表"
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "文档:客户科目的表"
+msgstr "文档:客户报表"
 
 #. module: account
 #: view:product.product:0
@@ -2933,20 +2931,20 @@ msgstr "税一览"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr "未对账处理"
+msgstr "未对账交易"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Reconcilation of entries from payment order."
-msgstr "付款单凭证对账"
+msgstr "付款单的对账分录"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
-msgstr "凭证明细"
+msgstr "分录明细"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2976,7 +2974,7 @@ msgstr "税代码"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Analytic Journal -"
-msgstr "辅助核算分类帐 -"
+msgstr "辅助核算分录集合 -"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -2986,7 +2984,7 @@ msgstr "辅助核算借方"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "兑换汇率"
+msgstr "兑出汇率"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
@@ -3005,7 +3003,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can chosse "
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
-msgstr "这月产生凭证的最后一天.你能选择在创建日期到合作伙伴付款条件的日期之间的一天."
+msgstr "这模型在到期日产生分录.  你能从创建日期到到付款期限间选择."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3032,20 +3030,20 @@ msgstr "计量单位"
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "应收款科目"
+msgstr ""
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果勾选此项系统将试图在产生发票时把凭证明细分组"
+msgstr "如果勾选此项, 系统将试图在从发票生成分录明细时分组"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
 msgid "# of Transaction"
-msgstr "处理号#"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
@@ -3059,17 +3057,17 @@ msgstr "取消所选发票"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算分录集合"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr "凭证标签"
+msgstr "分录标签"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Reconcilate the entries from payment"
-msgstr "付款凭证对账"
+msgstr "付款的对账分录"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -3087,7 +3085,7 @@ msgstr "设为草稿"
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "发票上产品单据的参考"
+msgstr "发票上单据产品的参考"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3134,7 +3132,7 @@ msgstr "说明"
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr "被提交的发票已检验、已验证和已打印"
+msgstr "计划的发票已检验、已确认和已打印"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
@@ -3162,7 +3160,7 @@ msgstr "科目"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr "银行日记账"
+msgstr "银行分录集合"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3188,7 +3186,7 @@ msgstr "备注"
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr "发票对账凭证跟着付款凭证."
+msgstr "发票凭证与付款凭证对账."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3203,7 +3201,7 @@ msgstr "税"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr "关闭会计年度的新凭证"
+msgstr "用新分录关闭会计年度"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3214,7 +3212,7 @@ msgstr "平均汇率"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr "对账单产生的付款凭证"
+msgstr "产品付款分录清单"
 
 #. module: account
 #: field:account.account,code:0
@@ -3251,17 +3249,17 @@ msgstr "无"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "年度结转"
+msgstr "产生会计年度开账分录"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
-msgstr "凭证对账"
+msgstr "对账分录"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(如果你要打开它"
+msgstr "(如果你想打开它发票应未对账)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3299,7 +3297,7 @@ msgstr "错误：需要BVR参照"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "没可打印的发票"
+msgstr "不打印在发票上"
 
 #. module: account
 #: field:account.move.line,move_id:0
@@ -3310,13 +3308,13 @@ msgstr "凭证"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "税来源"
+msgstr "源税"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
 msgid "Analytic Balance"
-msgstr "核算余额"
+msgstr "辅助核算余额"
 
 #. module: account
 #: view:account.move.line:0
@@ -3374,29 +3372,29 @@ msgstr "Python代码"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "银行对账单"
+msgstr "银行对帐单"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partner Accounts"
-msgstr "应收应付"
+msgstr "业务伙伴帐目"
 
 #. module: account
 #: help:account.tax.template,tax_group:0
 msgid ""
 "If a default tax if given in the partner it only override taxes from account "
 "(or product) of the same group."
-msgstr "如果默认税提供这业务伙伴的税只决定税来自科目(或产品)相同的分组"
+msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Real Entries"
-msgstr "实际凭证"
+msgstr "实际分录"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import invoice"
-msgstr "进项发票"
+msgstr "导入发票"
 
 #. module: account
 #: view:account.invoice:0
@@ -3408,7 +3406,7 @@ msgstr "创建"
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "创建凭证"
+msgstr "创建分录"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_line
@@ -3426,7 +3424,7 @@ msgstr "快捷键"
 msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accouting fields."
-msgstr "确认分类帐和会计期间的所有凭证草稿.这意味你将不能修改它的会计字段."
+msgstr "在分录集合和会计期间中将确认所有草稿分录. 这意味你将不能修改它的会计字段."
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -3439,13 +3437,13 @@ msgstr "日期中的一天"
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr "如果它是一个多货币凭证这金额示一个可选的的其它货币"
+msgstr "如果它是一个多货币分录这金额表示一个可选的的其它货币"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "上级税类科目"
+msgstr "上级税科目"
 
 #. module: account
 #: field:account.account,user_type:0
@@ -3459,7 +3457,7 @@ msgstr "科目类型"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr "银行账户所有者"
+msgstr "银行帐号所有者"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -3472,7 +3470,7 @@ msgstr "会计期间过滤"
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "应收账款"
+msgstr "应收账"
 
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
@@ -3483,18 +3481,18 @@ msgstr "支付和对账"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "总账"
+msgstr "主要的分录集合"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
-msgstr "余额转结"
+msgstr "余额结转"
 
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "合并子科目"
+msgstr "合并的子科目"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3514,7 +3512,7 @@ msgstr "余额:"
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "差额不为0"
+msgstr "余额不为0"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -3540,7 +3538,7 @@ msgstr "新的供应商退款"
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr "凭证模型"
+msgstr "分录模型"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3550,23 +3548,23 @@ msgstr "币别"
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr "科目表"
+msgstr "科目一览表"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr "周期"
+msgstr "周期性分录"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr "分类帐代码"
+msgstr "分录集合代码"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
 #: view:account.model:0
 msgid "Create entries"
-msgstr "创建凭证"
+msgstr "创建分录"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3591,20 +3589,20 @@ msgstr "计算税"
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "数字"
+msgstr "数字 #"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
 msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
-msgstr "当前这付款条件对当前的业务伙伴将用来替代默认"
+msgstr "当前业务伙伴将替代为这默认的付款条款"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr "凭证名称"
+msgstr "分录名称"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -3617,7 +3615,7 @@ msgstr "用在这发票的业务伙伴"
 msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
-msgstr "如果你不想发票显示有关的增值税"
+msgstr "勾选此项, 如果你不想发票显示任何增值税."
 
 #. module: account
 #: field:account.account.type,sequence:0
@@ -3640,7 +3638,7 @@ msgstr "财务结构模板"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Entry encoding"
-msgstr "凭证编号"
+msgstr "明细"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -3666,19 +3664,19 @@ msgstr "季度"
 #. module: account
 #: wizard_view:account.move.journal,init:0
 msgid "Standard entries"
-msgstr "标准凭证"
+msgstr "普通分录"
 
 #. module: account
 #: help:account.account,check_history:0
 msgid ""
 "Check this box if you want to print all entries when printing the General "
 "Ledger, otherwise it will only print its balance."
-msgstr "如果你想打印总账时打印所有凭证勾选此项.否则打印总账"
+msgstr "如果你想打印总账时打印所有分录, 勾选此项. 否则打印它的余额"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "付款条件明细"
+msgstr "付款条款明细"
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -3689,7 +3687,7 @@ msgstr "月"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "科目周期"
+msgstr "周期性分录科目"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -3701,7 +3699,7 @@ msgstr "到期日期"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "凭证周期"
+msgstr "周期性分录"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3723,13 +3721,13 @@ msgstr "开始日期"
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
-msgstr "选择科目表"
+msgstr "选择一览表"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 msgid "All Entries"
-msgstr "所有凭证"
+msgstr "所有分录"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftinvoices0
@@ -3772,19 +3770,19 @@ msgid ""
 "    "
 msgstr ""
 "财务和会计模块包括:\n"
-"    一般会计\n"
-"    成本/核算会计\n"
+"    普通会计\n"
+"    成本/辅助核算会计\n"
 "    第三方会计\n"
 "    税务管理\n"
 "    预算\n"
 "    客户和供应商发票\n"
-"    银行对账单\n"
+"    银行对帐单\n"
 "    "
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "凭证序列"
+msgstr "分录序列"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3795,25 +3793,25 @@ msgstr "已关闭"
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 msgid "Payment Entries"
-msgstr "付款凭证"
+msgstr "付款分录"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr "这科目可以选免税科目和不含税科目"
+msgstr "这科目可以选基础税的代码或税代码科目"
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
 msgid ""
 "If no account is specified, the reconciliation will be made using every "
 "accounts that can be reconcilied"
-msgstr "如果没有指定科目,对账将需要每个科目都能被对账."
+msgstr "如果没有指定科目,对账将可用任何一个能对账的科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr "逾期付款信息"
+msgstr "逾期付款打印信息"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3827,7 +3825,7 @@ msgstr "其它"
 #: model:ir.actions.wizard,name:account.wizard_general_ledger_report
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr "总账"
+msgstr "总分类帐"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -3849,7 +3847,7 @@ msgstr "这会计期间可以重叠"
 msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
-msgstr "这科目将用于当前产品分类的采购科目"
+msgstr "这科目将替换当前产品的默认出仓"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -3860,7 +3858,7 @@ msgstr "手动报表"
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr "帐簿"
+msgstr "财务分录集合"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3888,7 +3886,7 @@ msgstr "最大数量"
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr "会计期间"
+msgstr "会计期间名称"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3896,7 +3894,7 @@ msgid ""
 "Gives the type of the analytic journal. When a document (eg: an invoice) "
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
-msgstr "给出这辅助核算分类帐类型如:(发票)需要创建辅助核算凭证.系统将寻找匹配同一类型的分类帐."
+msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找同一类型匹配的分录集合."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3922,7 +3920,7 @@ msgstr "有效"
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Import from your bank statements"
-msgstr "从你的银行对账单导入"
+msgstr "从你的银行对帐单导入"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3937,12 +3935,12 @@ msgstr "客户会计属性"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Select entries"
-msgstr "选择凭证"
+msgstr "选择分录"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
 msgid "All Posted Entries"
-msgstr "所有已审核的凭证"
+msgstr "所有已登帐的分录"
 
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
@@ -3990,7 +3988,7 @@ msgstr "贷方"
 msgid ""
 "Indicate if the tax computation is based on the value computed for the "
 "computation of child taxes or based on the total amount."
-msgstr "表明如果税务计算是基于计算下级税或基于金额合计计算"
+msgstr "如果税计算是基于计算子税或基于总金额, 显示"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -4007,13 +4005,13 @@ msgstr "子代码"
 #. module: account
 #: field:account.invoice,move_name:0
 msgid "Account Move"
-msgstr "凭证编号"
+msgstr "凭证"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "对帐单明细"
+msgstr "银行对帐单明细"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4040,19 +4038,19 @@ msgstr "一般科目"
 msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very usefull for some reports."
-msgstr "此行的可选数量表示:已销售产品的数量.这数量用于非正式但非常有用的报表."
+msgstr "此行的可选数量表示: 售出产品数量. 这数量虽然不是必须但对于一些报表有用."
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
 msgid "       Include Reconciled Entries"
-msgstr "       包括已对账凭证"
+msgstr "       包括已对账分录"
 
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
-msgstr "你能通过勾选"
+msgstr "你能勾选此项去标记与有关业务伙伴的分录明细存在争议"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4084,23 +4082,23 @@ msgstr "一般"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr "贷方交易"
+msgstr "信用交易"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "分散的分类帐的序列"
+msgstr "分散的分录集合序列"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "分类帐使用的货币"
+msgstr "分录集合使用的货币"
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "分类帐栏"
+msgstr "分录集合栏"
 
 #. module: account
 #: selection:account.fiscalyear,state:0
@@ -4146,13 +4144,13 @@ msgstr "待处理"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
 msgid "Search Entries"
-msgstr "凭证查询"
+msgstr "查询分录集合"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr "辅助核算采购再开发票成本"
+msgstr "再开发票, 采购, 时间表的辅助核算成本"
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4172,7 +4170,7 @@ msgid ""
 "Allows you to change the sign of the balance amount displayed in the "
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
-msgstr "允许你修改报表显示的余额的符号,所以你能够看见正数的数字替代科目的负数"
+msgstr "允许你修改报表显示的余额的符号,所以你能看见费用科目为正数"
 
 #. module: account
 #: help:account.config.wizard,code:0
@@ -4184,7 +4182,7 @@ msgstr "报表上显示的会计年度名称"
 msgid ""
 "This field is used for payable and receivable entries. You can put the limit "
 "date for the payment of this entry line."
-msgstr "这字段用于应付账款和应收账款凭证.你可以放入支付凭证行的限制日期"
+msgstr "这字段用于应付和应收分录. 你可以在付款分录明细放入的限制日期"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -4199,7 +4197,7 @@ msgstr "上级左"
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr "这序列给出分类帐列表的显示顺序"
+msgstr "这序列提供分录集合列表的显示顺序"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
@@ -4266,12 +4264,12 @@ msgstr "会计期间"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr "分类帐/付款方式"
+msgstr "分录集合/付款方式"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Canceled Invoice"
-msgstr "取消发票"
+msgstr "已取消的发票"
 
 #. module: account
 #: view:account.subscription:0
@@ -4298,7 +4296,7 @@ msgstr "年合计"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import file from your bank statement"
-msgstr "从你的银行对账单导入文件"
+msgstr "从你的银行对帐单导入文件"
 
 #. module: account
 #: field:account.account,type:0
@@ -4315,23 +4313,23 @@ msgstr "9"
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "运行中的周期性凭证"
+msgstr "运行中的周期性分录"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Payment"
-msgstr "银行付款"
+msgstr "银行转帐"
 
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr "已审核"
+msgstr "已登帐"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "贷方票据"
+msgstr "贷方备注"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4343,7 +4341,7 @@ msgstr "结束日期"
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
 msgid "Cancel Opening Entries"
-msgstr "取消开账凭证"
+msgstr "取消开账分录"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
@@ -4372,18 +4370,18 @@ msgid ""
 "The sequence field is used to order the tax lines from the lowest sequences "
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
-msgstr "序列字段用于税明细的排序从低到高.如果税中有子税这排序是重要的"
+msgstr "序列字段用于税从低到高排序. 如果税中有子税这排序很重要"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "税申报"
+msgstr "税说明"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "File statement"
-msgstr "文件表"
+msgstr "文件声明"
 
 #. module: account
 #: view:ir.sequence:0
@@ -4393,7 +4391,7 @@ msgstr "会计年度序列"
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr "凭证模型明细"
+msgstr "分录模型明细"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4403,7 +4401,7 @@ msgstr "税模板"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr "这是一个经常性凭证的模型"
+msgstr "这是一个循环分录模型"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
@@ -4413,12 +4411,12 @@ msgstr "打开发票"
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "Set starting and ending balance for control"
-msgstr "设置开始和结束的余额控制"
+msgstr "设置开始和结束的控制余额"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr "你确定要开这发票?"
+msgstr "你确定要打开这发票?"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
@@ -4433,7 +4431,7 @@ msgstr "供应商借方"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr "凭证的可选数量"
+msgstr "可选数量"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -4452,7 +4450,7 @@ msgstr "状态"
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
 msgid "Accounting Entries"
-msgstr "凭证"
+msgstr "会计分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
@@ -4488,20 +4486,20 @@ msgstr "合计"
 #: model:process.transition,note:account.process_transition_customerinvoice0
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Number of entries are generated"
-msgstr "产生凭证编号"
+msgstr "产生编号"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Valid Entries"
-msgstr "有效凭证"
+msgstr "有效分录"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_use_model
 #: model:ir.actions.wizard,name:account.wizard_line_account_use_model
 #: model:ir.ui.menu,name:account.menu_account_use_model
 msgid "Create Entries From Models"
-msgstr "按模型创建凭证"
+msgstr "按模型创建分录"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4525,7 +4523,7 @@ msgstr "供应商退款"
 #. module: account
 #: help:account.model.line,date:0
 msgid "The date of the generated entries"
-msgstr "凭证产生的日期"
+msgstr "产生的日期"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
@@ -4540,21 +4538,21 @@ msgstr "供应商会计属性"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "辅助核算项目统计"
+msgstr "辅助核算项统计"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "这将根据你选择的模板自动设置你的科目表、银行账号、税和分类帐"
+msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和分录集合"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "对帐单"
+msgstr "银行对帐单"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4565,7 +4563,7 @@ msgstr "凭证列表"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr "辅助核算项目表"
+msgstr "辅助核算项一览表"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4581,13 +4579,13 @@ msgstr "含税价"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Entries by Journal"
-msgstr "管理会计凭证列表"
+msgstr "辅助核算分录集合"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr "发票有效凭证"
+msgstr "发票有效分录"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4624,22 +4622,22 @@ msgstr "运行中"
 msgid ""
 "Indicate if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
-msgstr "表明如果金额必须含税.用于计算下一个税"
+msgstr "表明如果税额必须包含在计算下一个税的基础金额里"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "报表草稿"
+msgstr "银行对帐单草稿"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr "分类帐名称"
+msgstr "分录集合名称"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr "来自对账单的进项发票"
+msgstr "从银行对帐单导入发票"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4662,7 +4660,7 @@ msgstr "从发票或者付款导入"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr "对账的凭证"
+msgstr "对账分录"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4677,7 +4675,7 @@ msgstr "图标"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr "分类帐-会计期间"
+msgstr "分录集合 - 会计期间"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
@@ -4693,7 +4691,7 @@ msgstr "创建月度会计期间"
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr "打印账龄分析表"
+msgstr "打印过去的试算表"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4721,7 +4719,7 @@ msgid ""
 "Check this box to determine that each entry of this journal won't create a "
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
-msgstr "勾选此项"
+msgstr "勾选此项, 在会计年度关闭时, 确定每个分录集合的分录不会产生新副本, 而是共享同一副本."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4732,7 +4730,7 @@ msgstr "已取消"
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "银行对账单草稿"
+msgstr "银行对帐单草稿"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4748,7 +4746,7 @@ msgstr "帐号"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr "辅助核算项目本月统计"
+msgstr "项成本和收入的分录集合(这月)"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -4765,7 +4763,7 @@ msgstr "打开未对账"
 #: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "银行对账单明细"
+msgstr "银行对帐单明细"
 
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
@@ -4782,7 +4780,7 @@ msgstr "控制发票"
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
-msgstr "应收账款"
+msgstr "应收的"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
@@ -4815,7 +4813,7 @@ msgstr "合计:"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr "项目.辅助核算.分类帐"
+msgstr "项. 辅助核算. 分录集合"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4838,7 +4836,7 @@ msgstr "科目对账"
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
@@ -4867,7 +4865,7 @@ msgstr "付款金额"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4919,17 +4917,17 @@ msgstr "发票明细"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "期初日期"
+msgstr "开始会计期间"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
 msgid "Name of new entries"
-msgstr "新凭证名称"
+msgstr "新名称"
 
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr "创建凭证"
+msgstr "创建"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4945,17 +4943,17 @@ msgstr "税说明"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr "链接动生成的凭证"
+msgstr "连接自动产生的凭证"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "已对账的处理"
+msgstr "已对账交易"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "内部报表"
+msgstr "报表"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -4967,7 +4965,7 @@ msgstr "/"
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr "生成凭证和一个数字"
+msgstr "生成记录和一个数字"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -4982,7 +4980,7 @@ msgstr "科目余额 -"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group invoice lines"
-msgstr "分票组"
+msgstr "按发票明细分组"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4993,28 +4991,28 @@ msgstr "设置"
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr "合计"
+msgstr "金额合计"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr "分类帐"
+msgstr "分录集合"
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr "周期明细"
+msgstr "周期性分录明细"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr "产品收入科目模板"
+msgstr "产品模板的收入科目"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr "强制对所有凭证含此外币"
+msgstr "强制所有凭证用这外币"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
@@ -5032,7 +5030,7 @@ msgstr "选择日期-会计期间"
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "反向核算余额 -"
+msgstr "反向辅助核算余额 -"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -5063,12 +5061,12 @@ msgstr "新的客户退款"
 msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
-msgstr "如果你想每个创建的分类帐使用一个不同的序列勾选此项.否则将使用同一序列"
+msgstr "勾选此项, 如果你想每个新建的分录集合使用不同的序列. 否则将使用同一序列"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr "进项发票"
+msgstr "导入发票"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -5086,28 +5084,28 @@ msgstr "维护发票序列与会计年度"
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr "一致"
+msgstr "进展"
 
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr "分类"
+msgstr "域"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "项目信息"
+msgstr "项信息"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "税代码模板"
+msgstr "科目税代码模板"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr "周期的会计期间"
+msgstr "周期性分录的会计期间"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5142,7 +5140,7 @@ msgstr "发票明细"
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr "补差额分类帐"
+msgstr "补差额分录集合"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
@@ -5152,7 +5150,7 @@ msgstr "全部付款"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr "采购分类帐"
+msgstr "采购分录集合"
 
 #. module: account
 #: selection:account.move,type:0
@@ -5168,7 +5166,7 @@ msgstr "替代的税"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr "从手动生效为草稿"
+msgstr "从手动转为草稿"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
@@ -5183,7 +5181,7 @@ msgstr "报表上的符号"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "如果是一个多货币凭证这是可选的其他货币"
+msgstr "如果是一个多货币凭证可选其它货币"
 
 #. module: account
 #: view:account.invoice:0
@@ -5195,7 +5193,7 @@ msgstr "付款"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr "确认报表"
+msgstr "在确认对帐单产生的会计分录"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5210,12 +5208,12 @@ msgstr "否"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr "所有凭证"
+msgstr "所分录"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr "纳税申报的计税基准"
+msgstr "税说明的税基"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5228,7 +5226,7 @@ msgstr "日期过滤"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr "选择分类帐和付款日期"
+msgstr "选择分录集合和付款日期"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5273,12 +5271,12 @@ msgstr "形式发票"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "部分凭证明细"
+msgstr "部分分录明细"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "这银行对账单用于银行对账"
+msgstr "这银行对帐单用于银行对帐"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -5288,7 +5286,7 @@ msgstr "会计年度"
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
 msgid "Open Entries"
-msgstr "打开凭证"
+msgstr "打开分录"
 
 #. module: account
 #: selection:account.analytic.account,type:0
@@ -5319,18 +5317,18 @@ msgstr "页"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr "其它信息"
+msgstr "可选信息"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr "应收款和应付款"
+msgstr "应收和应付"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5354,7 +5352,7 @@ msgid ""
 "If the Tax account is tax code account, this field will contain the taxed "
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
-msgstr "如果这科目是免税科目,这字段将含税.如果这科目是普通税科目这字段将不含税."
+msgstr "如果这税科目是免税科目, 这字段将含税款. 如果这科目是基本税代码这字段将含基础金额(不含税)."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5366,18 +5364,18 @@ msgstr "计算"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "选择产品的收入和采购科目"
+msgstr "选择产品的收入和费用科目"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr "税应用"
+msgstr "税适用"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr "周期性凭证"
+msgstr "周期性分录"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5399,19 +5397,19 @@ msgstr "会计期间数"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr "期末日期"
+msgstr "结束会计期间"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "普通分类帐"
+msgstr "一般分录集合"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5447,7 +5445,7 @@ msgstr "发票税"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr "定义辅助核算分类帐"
+msgstr "定义辅助核算分录集合"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -5457,7 +5455,7 @@ msgstr "科目.税.模板"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: constraint:account.period:0
@@ -5469,7 +5467,7 @@ msgstr "无效会计期间！一些会计期间重复或者会计期间不在这
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr "这序列用于这分类帐发票号"
+msgstr "这序列用于这分录集合的发票号"
 
 #. module: account
 #: view:account.account:0
@@ -5486,12 +5484,12 @@ msgid ""
 "This field allow you to choose the accounting journals you want for "
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
-msgstr "这字段允许你选择会计分类帐要过滤的发票.如果你设为空将搜索所有销售采购和现金分类帐"
+msgstr "这字段允许你选择要过滤的发票的会计分录集合. 如果为空将搜索所有销售, 采购和现金分录集合."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误!会计年度无效 "
+msgstr "错误!会计年度的期限无效 "
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5501,7 +5499,7 @@ msgstr "关闭"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "凭证编号"
+msgstr "凭证"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5534,7 +5532,7 @@ msgstr "成本分类账(只有数量)"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "审核凭证"
+msgstr "确认"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -5555,7 +5553,7 @@ msgstr "到"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr "待处理辅助核算分类帐"
+msgstr "打开的辅助核算分录集合分录"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5570,7 +5568,7 @@ msgstr "当前日期"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr "销售分类帐"
+msgstr "销售分录集合"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5588,7 +5586,7 @@ msgstr "关闭会计年度"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
 #: wizard_field:account.automatic.reconcile,init,date1:0
 msgid "Start of period"
-msgstr "期初日期"
+msgstr "开始会计期间"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5626,7 +5624,7 @@ msgstr "说明"
 msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
-msgstr "这科目将用于当前产品的默认销售收入科目"
+msgstr "这科目将替换当前产品的默认进仓"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5641,12 +5639,12 @@ msgstr "上级右"
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr "会计科目"
+msgstr "财务科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "科目表"
+msgstr "科目一览表模板"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -5658,7 +5656,7 @@ msgstr "科目设置"
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr "这科目将用于当前业务伙伴的默认应付科目"
+msgstr "这科目将替换当前业务伙伴的默认支付科目"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5680,12 +5678,12 @@ msgstr "收入科目"
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "开启会计期间"
+msgstr "打开/关闭会计期间"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "核算余额 -"
+msgstr "辅助核算余额 -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5717,30 +5715,30 @@ msgstr "会计属性"
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "科目.序号.会计年度"
+msgstr "科目.序列.会计年度"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr "凭证排序按"
+msgstr "分录排序按"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr "打印分类帐 -"
+msgstr "打印分录集合 -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr "模型定义"
+msgstr "分录模型定义"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
@@ -5758,7 +5756,7 @@ msgstr "目标科目"
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr "到期"
+msgstr "到期日期"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5794,12 +5792,12 @@ msgstr "供应商退款"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr "对账凭证"
+msgstr "对账分录"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "凭证"
+msgstr "分录"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5807,7 +5805,7 @@ msgstr "凭证"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr "支付发票时对账"
+msgstr "对账时支付发票"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5830,7 +5828,7 @@ msgstr "科目一览"
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
-msgstr "这科目将用于当前产品分类的采购科目"
+msgstr "这科目将替换当前产品分类的默认出仓"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5852,7 +5850,7 @@ msgstr "银行详情"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "产品采购科目模板"
+msgstr "产品模板的费用科目"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5862,7 +5860,7 @@ msgstr "一般借方"
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr "辅助核算代码"
+msgstr "辅助核算项代码"
 
 #. module: account
 #: help:account.config.wizard,name:0
@@ -5878,7 +5876,7 @@ msgstr "屏幕上显示的会计年度名称"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -5889,12 +5887,12 @@ msgstr "财务结构"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr "对账单处理"
+msgstr "银行对帐单处理"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr "对账单对账"
+msgstr "对帐单核销"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
@@ -5908,7 +5906,7 @@ msgstr "勾选此项"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "在产品和发票中使用含税价"
+msgstr "勾选, 如果你使用的产品和发票价格含税."
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5932,13 +5930,351 @@ msgstr "是"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "用户允许在这科目对账凭证"
+msgstr "勾选, 如果用户可以在这科目对账分录."
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "计算日期"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "关闭辅助核算项"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "发票草稿"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "会计控制台"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "科目开发票"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "成本开发票"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "以前应收款"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "会计面板"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "收入科目"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "我的指标"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "科目面板"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "以前收入"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "显示借方/贷方信息"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "所有科目"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "分录选择基于"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "通知"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "财务会计期间"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr "科目余额"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "选择会计期间"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "百分比"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "比较选择的会计年度"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "选择会计年度(最大值为三年)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "选择参考科目(比较%)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "科目结余会计年度比较"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+"科目结余模块是一附加的财务管理模块\n"
+"    \n"
+"\t该模块为你提供各种可选择打印的资产负债表\n"
+"\t1.你能比较资产负债表的不同年份.\n"
+"\t2.你能设置两年的现金或百分比比较\n"
+"\t3.你能设置特别年份的参考科目的百分比比较\n"
+"\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
+"\t5.你可以选择打印要求的报表\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "请勾选此项你能选择‘规定格式’选项"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "显示固定格式的报表"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "合计:"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "显示对比 %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "选择会计期间"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "报表选项"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "不比较"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "显示科目"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "你必须要选择多于3年."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "会计和财务管理-科目比较"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "会计年度:"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr "请勾选此项你最多能选择3年"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr "你已经选择‘百分比’选项这要2年以上. 但你没选择规定格式."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr "你可能存在以下错误. 请纠正后再试."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "留空为比较母公司"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr "你选择2年以上, 但未选‘百分比’选项"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项, 这才能产生打印的内容请再试."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr "你至少要选择一个会计年度再试"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "自定义报表"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "月度"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "发票建立要在15天前"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "最近15天创建发票的报表"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "金额合计"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "按类型划分的科目"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "直到今天的应收款"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "应收款科目"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "范围"
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr "新的报表模块"
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "科目报表-报表"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr "科目类型余额"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "会计年度里的周"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "旧的应收款"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "未完税金额"
+
 #~ msgid "           Start date"
 #~ msgstr "           开始日期"
 
@@ -5966,9 +6302,6 @@ msgstr "计算日期"
 #~ msgid "Check if you want to display Accounts with 0 balance too."
 #~ msgstr "科目余额为0的科目也显示"
 
-#~ msgid "Select Period"
-#~ msgstr "选会计期间"
-
 #~ msgid "x Bank Journal"
 #~ msgstr "x银行分类帐"
 
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index df45fde3227..04414f79746 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account
+# 	* account
 #
 msgid ""
 msgstr ""
@@ -90,8 +90,7 @@ msgid "Unreconciled entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,base_code_id:0
-#: field:account.tax,base_code_id:0
+#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
 msgstr ""
@@ -123,8 +122,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: field:account.tax,base_sign:0
-#: field:account.tax,ref_base_sign:0
+#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
@@ -185,10 +183,8 @@ msgid "Move line select"
 msgstr ""
 
 #. module: account
-#: rml:account.journal.period.print:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr ""
 
@@ -203,14 +199,12 @@ msgid "Period Sum"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr "计算编码(如果类型=编码)"
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Account Entry Line"
 msgstr ""
 
@@ -227,12 +221,9 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,amount:0
 #: field:account.bank.statement.line,amount:0
-#: field:account.bank.statement.reconcile.line,amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.tax,amount:0
-#: field:account.move,amount:0
-#: field:account.tax,amount:0
-#: field:account.tax.template,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0
+#: field:account.invoice.tax,amount:0 field:account.move,amount:0
+#: field:account.tax,amount:0 field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
 msgstr ""
@@ -269,8 +260,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.invoice,date_due:0
-#: help:account.invoice,payment_term:0
+#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
 "generation of accounting entries. If you keep the payment term and the due "
@@ -279,14 +269,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
+#: selection:account.tax,type:0 selection:account.tax.template,type:0
 msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_overdue
-#: view:res.company:0
+#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0
 msgid "Overdue Payments"
 msgstr ""
 
@@ -302,8 +290,7 @@ msgid "Select period"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,origin:0
-#: field:account.invoice.line,origin:0
+#: field:account.invoice,origin:0 field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
 
@@ -333,8 +320,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
+#: rml:account.invoice:0 field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
 msgstr ""
@@ -353,14 +339,12 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
+#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0
 msgid "Tax on Children"
 msgstr ""
 
 #. module: account
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
 msgstr ""
@@ -428,11 +412,8 @@ msgid "Contra"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,state:0
-#: field:account.bank.statement,state:0
-#: field:account.invoice,state:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: field:account.analytic.account,state:0 field:account.bank.statement,state:0
+#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
 msgstr ""
@@ -444,8 +425,7 @@ msgid "Unpaid Supplier Refunds"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Special Computation"
 msgstr ""
 
@@ -467,10 +447,8 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: account
-#: rml:account.general.ledger:0
-#: field:account.model,ref:0
-#: field:account.move,ref:0
-#: rml:account.overdue:0
+#: rml:account.general.ledger:0 field:account.model,ref:0
+#: field:account.move,ref:0 rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
 msgstr ""
@@ -661,8 +639,7 @@ msgid "Sub-Total :"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
-#: view:account.analytic.line:0
+#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
@@ -694,8 +671,7 @@ msgid "Select the Period for Analysis"
 msgstr ""
 
 #. module: account
-#: field:account.tax,ref_tax_sign:0
-#: field:account.tax,tax_sign:0
+#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
@@ -727,8 +703,7 @@ msgid "Field Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,sign:0
-#: field:account.tax.code.template,sign:0
+#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0
 msgid "Sign for parent"
 msgstr ""
 
@@ -738,8 +713,7 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Purchase Properties"
 msgstr ""
 
@@ -759,12 +733,9 @@ msgid "Move Lines Created."
 msgstr ""
 
 #. module: account
-#: field:account.fiscalyear,state:0
-#: field:account.journal.period,state:0
-#: field:account.move,state:0
-#: field:account.move.line,state:0
-#: field:account.period,state:0
-#: field:account.subscription,state:0
+#: field:account.fiscalyear,state:0 field:account.journal.period,state:0
+#: field:account.move,state:0 field:account.move.line,state:0
+#: field:account.period,state:0 field:account.subscription,state:0
 msgid "Status"
 msgstr ""
 
@@ -917,10 +888,8 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.analytic.line,unit_amount:0
-#: rml:account.invoice:0
-#: field:account.invoice.line,quantity:0
-#: field:account.model.line,quantity:0
+#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0
+#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
 msgstr ""
@@ -963,16 +932,13 @@ msgstr ""
 #: wizard_field:account.automatic.reconcile,init,period_id:0
 #: field:account.bank.statement,period_id:0
 #: wizard_field:account.central.journal.report,init,period_id:0
-#: view:account.fiscalyear:0
-#: rml:account.general.journal:0
+#: view:account.fiscalyear:0 rml:account.general.journal:0
 #: wizard_field:account.general.journal.report,init,period_id:0
 #: wizard_field:account.invoice.pay,init,period_id:0
-#: field:account.journal.period,period_id:0
-#: field:account.move,period_id:0
+#: field:account.journal.period,period_id:0 field:account.move,period_id:0
 #: wizard_field:account.move.journal,init,period_id:0
 #: field:account.move.line,period_id:0
-#: wizard_field:account.move.validate,init,period_id:0
-#: view:account.period:0
+#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
@@ -994,8 +960,7 @@ msgid "Net Total:"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,name:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
 #: field:account.fiscal.position.account.template,position_id:0
 #: field:account.fiscal.position.tax,position_id:0
@@ -1117,8 +1082,7 @@ msgid "Fiscal Position Templates"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.line,price_unit:0
+#: rml:account.invoice:0 field:account.invoice.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
 
@@ -1271,8 +1235,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
 msgstr ""
@@ -1294,8 +1257,7 @@ msgid "Write-Off account"
 msgstr ""
 
 #. module: account
-#: field:account.model.line,model_id:0
-#: field:account.subscription,model_id:0
+#: field:account.model.line,model_id:0 field:account.subscription,model_id:0
 msgid "Model"
 msgstr ""
 
@@ -1321,11 +1283,9 @@ msgid "Select invoices you want to pay and manages advances"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: model:account.account.type,name:account.account_type_root
-#: selection:account.analytic.account,type:0
-#: field:account.journal,view_id:0
+#: selection:account.analytic.account,type:0 field:account.journal,view_id:0
 msgid "View"
 msgstr ""
 
@@ -1394,8 +1354,7 @@ msgstr ""
 #: wizard_field:account.central.journal.report,init,journal_id:0
 #: wizard_field:account.general.journal.report,init,journal_id:0
 #: field:account.invoice,journal_id:0
-#: field:account.journal.period,journal_id:0
-#: field:account.model,journal_id:0
+#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0
 #: field:account.move,journal_id:0
 #: wizard_field:account.move.bank.reconcile,init,journal_id:0
 #: wizard_field:account.move.journal,init,journal_id:0
@@ -1411,8 +1370,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
+#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
 msgstr ""
 
@@ -1438,8 +1396,7 @@ msgid "Statement reconcile line"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the income account"
 msgstr ""
 
@@ -1566,8 +1523,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
 
@@ -1577,8 +1533,7 @@ msgid "Account to reconcile"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.model.line,partner_id:0
+#: rml:account.invoice:0 field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
 msgstr ""
@@ -1590,14 +1545,12 @@ msgid "Receivable and Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.subscription:0
-#: field:account.subscription,lines_id:0
+#: view:account.subscription:0 field:account.subscription,lines_id:0
 msgid "Subscription Lines"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
@@ -1761,8 +1714,7 @@ msgid "Period length (days)"
 msgstr ""
 
 #. module: account
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
+#: selection:account.payment.term.line,value:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
@@ -1773,8 +1725,7 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
@@ -1848,12 +1799,9 @@ msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,type:0
-#: field:account.bank.statement.line,type:0
-#: field:account.invoice,type:0
-#: field:account.journal,type:0
-#: field:account.move,type:0
-#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
+#: field:account.bank.statement.line,type:0 field:account.invoice,type:0
+#: field:account.journal,type:0 field:account.move,type:0
+#: field:account.move.reconcile,type:0 xsl:account.transfer:0
 msgid "Type"
 msgstr "类型"
 
@@ -2001,8 +1949,7 @@ msgid "Journal-Period Name"
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,name:0
-#: field:account.tax.code.template,name:0
+#: field:account.tax.code,name:0 field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr ""
 
@@ -2017,8 +1964,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,partner_id:0
+#: rml:account.general.ledger:0 field:account.invoice,partner_id:0
 #: field:account.move,partner_id:0
 #: wizard_field:account.partner.balance.report,init,result_selection:0
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
@@ -2091,10 +2037,8 @@ msgstr ""
 #: field:account.bank.statement,currency:0
 #: field:account.bank.statement.reconcile,total_currency:0
 #: field:account.bank.statement.reconcile,total_second_currency:0
-#: rml:account.general.ledger:0
-#: field:account.invoice,currency_id:0
-#: field:account.journal,currency:0
-#: field:account.model.line,currency_id:0
+#: rml:account.general.ledger:0 field:account.invoice,currency_id:0
+#: field:account.journal,currency:0 field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
 msgstr ""
@@ -2132,8 +2076,7 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0
-#: field:res.company,overdue_msg:0
+#: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2185,8 +2128,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Consolidation"
 msgstr ""
 
@@ -2278,21 +2220,16 @@ msgid "The account basis of the tax declaration."
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,date:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: field:account.bank.statement.reconcile,name:0
-#: rml:account.general.ledger:0
+#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0
 #: selection:account.general.ledger.report,checktype,sortbydate:0
-#: rml:account.journal.period.print:0
-#: field:account.move,date:0
+#: rml:account.journal.period.print:0 field:account.move,date:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
-#: field:account.subscription.line,date:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
@@ -2309,8 +2246,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: field:account.tax,type:0
-#: field:account.tax.template,type:0
+#: field:account.tax,type:0 field:account.tax.template,type:0
 msgid "Tax Type"
 msgstr ""
 
@@ -2320,8 +2256,7 @@ msgid "Statement Entries"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,user_id:0
-#: field:account.journal,user_id:0
+#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0
 msgid "User"
 msgstr ""
 
@@ -2407,8 +2342,7 @@ msgid "Date End"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
+#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
@@ -2416,8 +2350,7 @@ msgid "Entry Lines"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
 msgstr "适用编码(如果类型=编码)"
 
@@ -2506,11 +2439,9 @@ msgstr ""
 #: wizard_button:account.general.journal.report,init,end:0
 #: wizard_button:account.general.ledger.report,account_selection,end:0
 #: wizard_button:account.general.ledger.report,checktype,end:0
-#: view:account.invoice:0
-#: wizard_button:account.invoice.pay,addendum,end:0
+#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0
 #: wizard_button:account.invoice.pay,init,end:0
-#: wizard_button:account.invoice.refund,init,end:0
-#: view:account.move:0
+#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0
 #: wizard_button:account.move.bank.reconcile,init,end:0
 #: wizard_button:account.move.journal,init,end:0
 #: wizard_button:account.move.line.reconcile,addendum,end:0
@@ -2529,8 +2460,7 @@ msgstr ""
 #: wizard_button:account.third_party_ledger.report,init,end:0
 #: wizard_button:account.vat.declaration,init,end:0
 #: wizard_button:account_use_models,init_form,end:0
-#: view:wizard.company.setup:0
-#: view:wizard.multi.charts.accounts:0
+#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0
 msgid "Cancel"
 msgstr ""
 
@@ -2540,10 +2470,8 @@ msgid "Acc. Type Name"
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
+#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0
 #: help:account.tax.template,base_code_id:0
 #: help:account.tax.template,ref_base_code_id:0
 #: help:account.tax.template,ref_tax_code_id:0
@@ -2557,8 +2485,7 @@ msgid "Litigation"
 msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-#: wizard_view:account.move.validate,init:0
+#: view:account.move.line:0 wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
 msgstr ""
@@ -2668,8 +2595,7 @@ msgid "Price"
 msgstr ""
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-#: rml:account.third_party_ledger:0
+#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
 msgstr ""
@@ -2736,17 +2662,13 @@ msgid "Invoice Reference"
 msgstr "发票参照"
 
 #. module: account
-#: field:account.account,name:0
-#: field:account.account.template,name:0
+#: field:account.account,name:0 field:account.account.template,name:0
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.bank.statement.line,name:0
-#: field:account.chart.template,name:0
-#: field:account.config.wizard,name:0
-#: field:account.model.line,name:0
-#: field:account.move,name:0
-#: field:account.move.line,name:0
-#: field:account.move.reconcile,name:0
+#: field:account.chart.template,name:0 field:account.config.wizard,name:0
+#: field:account.model.line,name:0 field:account.move,name:0
+#: field:account.move.line,name:0 field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
 msgstr "名称"
@@ -2786,8 +2708,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.journal.column,view_id:0
-#: view:account.journal.view:0
+#: field:account.journal.column,view_id:0 view:account.journal.view:0
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
@@ -2880,16 +2801,11 @@ msgid "Full Account Name"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
 
@@ -2910,11 +2826,9 @@ msgid "Document: Customer account statement"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-#: view:res.partner:0
+#: model:ir.ui.menu,name:account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "账号"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2957,10 +2871,8 @@ msgid "Centralisation"
 msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,tax_code_id:0
-#: field:account.tax,description:0
-#: field:account.tax,tax_code_id:0
-#: field:account.tax.template,tax_code_id:0
+#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0
+#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
 msgstr ""
@@ -3000,14 +2912,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Situation"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: xsl:account.transfer:0
+#: rml:account.invoice:0 xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3045,8 +2955,7 @@ msgid "Cancel selected invoices"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.journal:0
-#: field:account.analytic.line,journal_id:0
+#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
@@ -3069,28 +2978,23 @@ msgid "("
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.period:0
-#: view:account.subscription:0
+#: view:account.invoice:0 view:account.period:0 view:account.subscription:0
 msgid "Set to Draft"
 msgstr "报送草案"
 
 #. module: account
-#: help:account.invoice,origin:0
-#: help:account.invoice.line,origin:0
+#: help:account.invoice,origin:0 help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice.tax,base:0
+#: rml:account.invoice:0 field:account.invoice.tax,base:0
 msgid "Base"
 msgstr ""
 
@@ -3100,8 +3004,7 @@ msgid "Model Name"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Others"
 msgstr ""
 
@@ -3111,15 +3014,13 @@ msgid "8"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.move:0
+#: view:account.invoice:0 view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
 msgstr ""
 
 #. module: account
-#: view:account.model:0
-#: field:account.model,legend:0
+#: view:account.model:0 field:account.model,legend:0
 msgid "Legend"
 msgstr ""
 
@@ -3134,17 +3035,14 @@ msgid "account.move.line.select"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: rml:account.account.balance:0
+#: view:account.account:0 rml:account.account.balance:0
 #: wizard_field:account.account.balance.report,account_selection,Account_list:0
 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
 #: field:account.bank.statement.line,account_id:0
 #: field:account.bank.statement.reconcile.line,account_id:0
-#: field:account.invoice,account_id:0
-#: field:account.invoice.line,account_id:0
+#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0
 #: field:account.journal,account_control_ids:0
-#: field:account.model.line,account_id:0
-#: field:account.move.line,account_id:0
+#: field:account.model.line,account_id:0 field:account.move.line,account_id:0
 #: wizard_field:account.move.line.reconcile.select,init,account_id:0
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
@@ -3165,12 +3063,9 @@ msgid "By Date and Period"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,note:0
-#: field:account.fiscal.position,note:0
-#: view:account.invoice.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.bank.statement:0 field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0 view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
 msgstr ""
@@ -3183,8 +3078,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.invoice.line,invoice_line_tax_id:0
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.ui.menu,name:account.menu_action_tax_form
@@ -3209,21 +3103,15 @@ msgid "Statement encoding produces payment entries"
 msgstr ""
 
 #. module: account
-#: field:account.account,code:0
-#: rml:account.account.balance:0
-#: field:account.account.template,code:0
-#: field:account.account.type,code:0
+#: field:account.account,code:0 rml:account.account.balance:0
+#: field:account.account.template,code:0 field:account.account.type,code:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: field:account.analytic.line,code:0
-#: field:account.config.wizard,code:0
-#: field:account.fiscalyear,code:0
-#: rml:account.general.journal:0
-#: field:account.journal,code:0
-#: rml:account.partner.balance:0
-#: field:account.period,code:0
+#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0
+#: rml:account.general.journal:0 field:account.journal,code:0
+#: rml:account.partner.balance:0 field:account.period,code:0
 msgid "Code"
 msgstr ""
 
@@ -3233,8 +3121,7 @@ msgid "Financial Management"
 msgstr ""
 
 #. module: account
-#: selection:account.account.type,close_method:0
-#: selection:account.tax,type:0
+#: selection:account.account.type,close_method:0 selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
 msgstr ""
@@ -3261,8 +3148,7 @@ msgid "Additionnal Information"
 msgstr "附加信息"
 
 #. module: account
-#: field:account.tax,name:0
-#: field:account.tax.template,name:0
+#: field:account.tax,name:0 field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
 msgstr "税名称"
@@ -3339,8 +3225,7 @@ msgid "Partner Balance"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
 msgstr ""
 
@@ -3353,8 +3238,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
-#: field:account.tax,python_applicable:0
-#: field:account.tax,python_compute:0
+#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,applicable_type:0
 #: field:account.tax.template,python_applicable:0
@@ -3391,8 +3275,7 @@ msgid "Import invoice"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:wizard.company.setup:0
+#: view:account.invoice:0 view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
 msgstr ""
@@ -3408,8 +3291,7 @@ msgid "Invoice line"
 msgstr ""
 
 #. module: account
-#: field:account.account,shortcut:0
-#: field:account.account.template,shortcut:0
+#: field:account.account,shortcut:0 field:account.account.template,shortcut:0
 msgid "Shortcut"
 msgstr ""
 
@@ -3434,15 +3316,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax,parent_id:0
-#: field:account.tax.template,parent_id:0
+#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
 msgstr "父项税账号"
 
 #. module: account
 #: field:account.account,user_type:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
+#: field:account.account.template,user_type:0 view:account.account.type:0
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
@@ -3478,8 +3358,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
 msgstr ""
 
@@ -3555,8 +3434,7 @@ msgid "Journal code"
 msgstr ""
 
 #. module: account
-#: wizard_button:account.fiscalyear.close,init,close:0
-#: view:account.model:0
+#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0
 msgid "Create entries"
 msgstr ""
 
@@ -3612,14 +3490,11 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.account.type,sequence:0
-#: field:account.invoice.tax,sequence:0
-#: field:account.journal.column,sequence:0
-#: field:account.model.line,sequence:0
+#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0
+#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
-#: field:account.tax,sequence:0
-#: field:account.tax.template,sequence:0
+#: field:account.tax,sequence:0 field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
 msgstr ""
@@ -3685,8 +3560,7 @@ msgstr ""
 
 #. module: account
 #: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
+#: field:account.move.line,date_maturity:0 rml:account.overdue:0
 msgid "Maturity date"
 msgstr ""
 
@@ -3706,8 +3580,7 @@ msgid "Account Configure Wizard "
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
+#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
 msgstr ""
@@ -3745,8 +3618,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: field:account.account,note:0
-#: field:account.account.template,note:0
+#: field:account.account,note:0 field:account.account.template,note:0
 msgid "Note"
 msgstr ""
 
@@ -3770,8 +3642,7 @@ msgid "Entry Sequence"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 msgid "Closed"
 msgstr ""
 
@@ -3892,12 +3763,9 @@ msgid "Code/Date"
 msgstr ""
 
 #. module: account
-#: field:account.account,active:0
-#: field:account.analytic.account,active:0
-#: field:account.analytic.journal,active:0
-#: field:account.journal,active:0
-#: field:account.journal.period,active:0
-#: field:account.payment.term,active:0
+#: field:account.account,active:0 field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0 field:account.journal,active:0
+#: field:account.journal.period,active:0 field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
 msgstr "活动的"
@@ -3949,20 +3817,15 @@ msgid "Secondary Currency"
 msgstr "流动资金"
 
 #. module: account
-#: field:account.account,credit:0
-#: rml:account.account.balance:0
+#: field:account.account,credit:0 rml:account.account.balance:0
 #: field:account.analytic.account,credit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,credit:0
-#: field:account.move.line,credit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.central.journal:0 rml:account.journal.period.print:0
+#: field:account.model.line,credit:0 field:account.move.line,credit:0
+#: rml:account.partner.balance:0 rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
@@ -3993,8 +3856,7 @@ msgid "Account Move"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: field:account.bank.statement,line_ids:0
+#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0
 msgid "Statement lines"
 msgstr ""
 
@@ -4086,18 +3948,15 @@ msgid "Journal Column"
 msgstr ""
 
 #. module: account
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
-#: field:account.config.wizard,period:0
-#: view:account.fiscalyear:0
+#: field:account.config.wizard,period:0 view:account.fiscalyear:0
 #: field:account.fiscalyear,period_ids:0
 #: wizard_field:account.general.ledger.report,checktype,periods:0
 #: wizard_field:account.partner.balance.report,init,periods:0
@@ -4110,8 +3969,7 @@ msgid "Periods"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 #: field:account.move.line,invoice:0
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
@@ -4138,8 +3996,7 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
 
 #. module: account
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
+#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0
 msgid "Default Taxes"
 msgstr ""
 
@@ -4192,8 +4049,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,name:0
 #: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.central.journal:0
+#: rml:account.analytic.account.balance:0 rml:account.central.journal:0
 msgid "Account Name"
 msgstr ""
 
@@ -4284,8 +4140,7 @@ msgid "Import file from your bank statement"
 msgstr ""
 
 #. module: account
-#: field:account.account,type:0
-#: field:account.account.template,type:0
+#: field:account.account,type:0 field:account.account.template,type:0
 msgid "Internal Type"
 msgstr ""
 
@@ -4311,14 +4166,12 @@ msgid "Posted"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
+#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0
 msgid "End Date"
 msgstr ""
 
@@ -4339,8 +4192,7 @@ msgid "Day of the Month"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.journal,line_ids:0
-#: field:account.tax.code,line_ids:0
+#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0
 msgid "Lines"
 msgstr ""
 
@@ -4358,8 +4210,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr ""
 
@@ -4419,14 +4270,12 @@ msgid "The optional quantity on entries"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "JNRL"
 msgstr ""
 
 #. module: account
-#: view:account.fiscalyear:0
-#: view:account.period:0
+#: view:account.fiscalyear:0 view:account.period:0
 msgid "States"
 msgstr ""
 
@@ -4462,8 +4311,7 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
+#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0
 msgid "Total"
 msgstr ""
 
@@ -4580,11 +4428,9 @@ msgstr ""
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
 #: wizard_field:account.general.ledger.report,checktype,company_id:0
-#: field:account.invoice,company_id:0
-#: field:account.journal,company_id:0
+#: field:account.invoice,company_id:0 field:account.journal,company_id:0
 #: wizard_field:account.partner.balance.report,init,company_id:0
-#: field:account.tax,company_id:0
-#: field:account.tax.code,company_id:0
+#: field:account.tax,company_id:0 field:account.tax.code,company_id:0
 #: wizard_field:account.third_party_ledger.report,init,company_id:0
 #: wizard_field:account.vat.declaration,init,company_id:0
 #: field:wizard.company.setup,company_id:0
@@ -4679,12 +4525,9 @@ msgid "Print Aged Trial Balance"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,ref:0
-#: field:account.bank.statement.line,ref:0
-#: field:account.model.line,ref:0
-#: field:account.move.line,ref:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0 field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "Ref."
 msgstr ""
 
@@ -4761,8 +4604,7 @@ msgid "Control Invoice"
 msgstr ""
 
 #. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
+#: selection:account.account,type:0 selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
 msgstr ""
@@ -4789,8 +4631,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
-#: rml:account.central.journal:0
-#: rml:account.general.journal:0
+#: rml:account.central.journal:0 rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
 msgstr ""
@@ -4801,8 +4642,7 @@ msgid "account.analytic.journal"
 msgstr ""
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
+#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
 msgstr ""
@@ -4818,8 +4658,7 @@ msgid "Account Reconciliation"
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
+#: view:account.bank.statement:0 selection:account.bank.statement,state:0
 msgid "Confirm"
 msgstr ""
 
@@ -4834,8 +4673,7 @@ msgid "Parent Account Template"
 msgstr ""
 
 #. module: account
-#: help:account.tax,domain:0
-#: help:account.tax.template,domain:0
+#: help:account.tax,domain:0 help:account.tax.template,domain:0
 msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
@@ -4853,8 +4691,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Invoice"
 msgstr ""
 
@@ -4864,22 +4701,16 @@ msgid "Valid"
 msgstr ""
 
 #. module: account
-#: field:account.account,debit:0
-#: rml:account.account.balance:0
+#: field:account.account,debit:0 rml:account.account.balance:0
 #: field:account.analytic.account,debit:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
-#: rml:account.central.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: field:account.model.line,debit:0
-#: field:account.move.line,debit:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.central.journal:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 field:account.model.line,debit:0
+#: field:account.move.line,debit:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
 msgstr ""
@@ -4941,8 +4772,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
+#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0
 msgid "/"
 msgstr ""
 
@@ -4973,8 +4803,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
+#: view:account.analytic.line:0 view:account.invoice:0
 msgid "Total amount"
 msgstr ""
 
@@ -5024,14 +4853,12 @@ msgid "Paid invoice"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.tax:0 view:account.tax.template:0
 msgid "Tax Definition"
 msgstr ""
 
 #. module: account
-#: field:account.tax,tax_group:0
-#: field:account.tax.template,tax_group:0
+#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0
 msgid "Tax Group"
 msgstr ""
 
@@ -5072,8 +4899,7 @@ msgid "With movements"
 msgstr ""
 
 #. module: account
-#: field:account.tax,domain:0
-#: field:account.tax.template,domain:0
+#: field:account.tax,domain:0 field:account.tax.template,domain:0
 msgid "Domain"
 msgstr "所有权？"
 
@@ -5098,9 +4924,7 @@ msgid "Manually"
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: view:account.tax:0
-#: view:account.tax.template:0
+#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0
 #: selection:account.vat.declaration,init,based_on:0
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
@@ -5117,8 +4941,7 @@ msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: view:account.invoice.line:0
-#: field:account.invoice.tax,invoice_id:0
+#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
 msgstr "发票行"
 
@@ -5169,8 +4992,7 @@ msgid "The optional other currency if it is a multi-currency entry."
 msgstr ""
 
 #. module: account
-#: view:account.invoice:0
-#: field:account.invoice,payment_ids:0
+#: view:account.invoice:0 field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
 msgstr ""
@@ -5216,12 +5038,9 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 #: selection:account.bank.statement,state:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.journal.period,state:0
-#: selection:account.move,state:0
-#: selection:account.move.line,state:0
-#: selection:account.period,state:0
+#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0
+#: selection:account.journal.period,state:0 selection:account.move,state:0
+#: selection:account.move.line,state:0 selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
 msgstr ""
@@ -5248,8 +5067,7 @@ msgid "Are you sure ?"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: view:account.invoice:0
+#: rml:account.invoice:0 view:account.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
@@ -5285,22 +5103,16 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
-#: rml:account.vat.declaration:0
+#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0
+#: rml:account.journal.period.print:0 rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.move:0 view:account.move.line:0
 msgid "Optional Information"
 msgstr ""
 
@@ -5316,8 +5128,7 @@ msgid "Receivable and Payable"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.general.journal:0
+#: rml:account.account.balance:0 rml:account.general.journal:0
 msgid ":"
 msgstr ""
 
@@ -5340,8 +5151,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-#: view:account.bank.statement.reconcile:0
+#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
 msgstr ""
@@ -5385,8 +5195,7 @@ msgid "End of period"
 msgstr ""
 
 #. module: account
-#: view:account.move:0
-#: model:ir.model,name:account.model_account_move
+#: view:account.move:0 model:ir.model,name:account.model_account_move
 msgid "Account Entry"
 msgstr ""
 
@@ -5397,8 +5206,7 @@ msgid "General Journal"
 msgstr ""
 
 #. module: account
-#: field:account.account,balance:0
-#: rml:account.account.balance:0
+#: field:account.account,balance:0 rml:account.account.balance:0
 #: selection:account.account.type,close_method:0
 #: field:account.analytic.account,balance:0
 #: rml:account.analytic.account.balance:0
@@ -5406,12 +5214,9 @@ msgstr ""
 #: rml:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,balance_end:0
 #: field:account.bank.statement.reconcile,total_balance:0
-#: rml:account.general.ledger:0
-#: field:account.move.line,balance:0
-#: rml:account.partner.balance:0
-#: selection:account.payment.term.line,value:0
-#: selection:account.tax,type:0
-#: rml:account.third_party_ledger:0
+#: rml:account.general.ledger:0 field:account.move.line,balance:0
+#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0 rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
 msgstr ""
@@ -5455,11 +5260,8 @@ msgid "The sequence used for invoice numbers in this journal."
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: view:account.account.template:0
-#: view:account.journal:0
-#: view:account.move:0
-#: view:account.move.line:0
+#: view:account.account:0 view:account.account.template:0
+#: view:account.journal:0 view:account.move:0 view:account.move.line:0
 msgid "General Information"
 msgstr ""
 
@@ -5498,8 +5300,7 @@ msgid "List of Accounts"
 msgstr ""
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Sales Properties"
 msgstr ""
 
@@ -5592,15 +5393,11 @@ msgstr ""
 #: view:account.analytic.account:0
 #: field:account.analytic.account,description:0
 #: field:account.analytic.line,name:0
-#: field:account.bank.statement.reconcile.line,name:0
-#: rml:account.invoice:0
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0
+#: field:account.invoice,name:0 field:account.invoice.line,name:0
 #: wizard_field:account.invoice.refund,init,description:0
-#: rml:account.overdue:0
-#: field:account.payment.term,note:0
-#: field:account.tax.code,info:0
-#: field:account.tax.code.template,info:0
+#: rml:account.overdue:0 field:account.payment.term,note:0
+#: field:account.tax.code,info:0 field:account.tax.code.template,info:0
 msgid "Description"
 msgstr ""
 
@@ -5644,8 +5441,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
+#: field:account.tax.code,code:0 field:account.tax.code.template,code:0
 msgid "Case Code"
 msgstr ""
 
@@ -5727,8 +5523,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
+#: selection:account.analytic.journal,type:0 selection:account.journal,type:0
 msgid "Cash"
 msgstr ""
 
@@ -5768,8 +5563,7 @@ msgid "Keep empty for all open fiscal year"
 msgstr ""
 
 #. module: account
-#: rml:account.invoice:0
-#: selection:account.invoice,type:0
+#: rml:account.invoice:0 selection:account.invoice,type:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -5816,10 +5610,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: help:account.tax,base_sign:0
-#: help:account.tax,ref_base_sign:0
-#: help:account.tax,ref_tax_sign:0
-#: help:account.tax,tax_sign:0
+#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0
 #: help:account.tax.template,base_sign:0
 #: help:account.tax.template,ref_base_sign:0
 #: help:account.tax.template,ref_tax_sign:0
@@ -5853,10 +5645,8 @@ msgid "Name of the fiscal year as displayed on screens."
 msgstr ""
 
 #. module: account
-#: field:account.invoice,payment_term:0
-#: view:account.payment.term:0
-#: field:account.payment.term,name:0
-#: view:account.payment.term.line:0
+#: field:account.invoice,payment_term:0 view:account.payment.term:0
+#: field:account.payment.term,name:0 view:account.payment.term.line:0
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
@@ -5913,11 +5703,338 @@ msgstr ""
 
 #. module: account
 #: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
+msgid "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with credit/"
+"debit columns and % option.This can lead contents to be printed out of the "
+"paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+#: model:ir.ui.menu,name:account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index fc048138256..62f998fa751 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -45,24 +45,25 @@ class account_invoice(osv.osv):
             res[invoice.id]['amount_total'] = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
         return res
 
-    def _get_journal(self, cr, uid, context):
+    def _get_journal(self, cr, uid, context=None):
         if context is None:
             context = {}
         type_inv = context.get('type', 'out_invoice')
-        user = self.pool.get('res.users').browse(cr, uid, uid)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         company_id = context.get('company_id', user.company_id.id)
-        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
         refund_journal = {'out_invoice': False, 'in_invoice': False, 'out_refund': True, 'in_refund': True}
         journal_obj = self.pool.get('account.journal')
         res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
-                                            ('company_id', '=', company_id),('refund_journal', '=', refund_journal.get(type_inv, False))],
+                                            ('company_id', '=', company_id),
+                                            ('refund_journal', '=', refund_journal.get(type_inv, False))],
                                                 limit=1)
         if res:
             return res[0]
         else:
             return False
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
         if user.company_id:
             return user.company_id.currency_id.id
@@ -80,10 +81,9 @@ class account_invoice(osv.osv):
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
-        type = context.get('type', 'out_invoice')
-        return type
+        return context.get('type', 'out_invoice')
 
-    def _reconciled(self, cr, uid, ids, name, args, context):
+    def _reconciled(self, cr, uid, ids, name, args, context=None):
         res = {}
         for id in ids:
             res[id] = self.test_paid(cr, uid, [id])
@@ -94,8 +94,11 @@ class account_invoice(osv.osv):
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         res = {}
-        data_inv = self.browse(cr, uid, ids)
         cur_obj = self.pool.get('res.currency')
+        data_inv = self.browse(cr, uid, ids)
+        if context is None:
+            context = {}
+
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})
@@ -187,7 +190,7 @@ class account_invoice(osv.osv):
             result[invoice.id] = lines
         return result
 
-    def _get_invoice_from_line(self, cr, uid, ids, context={}):
+    def _get_invoice_from_line(self, cr, uid, ids, context=None):
         move = {}
         for line in self.pool.get('account.move.line').browse(cr, uid, ids):
             if line.reconcile_partial_id:
@@ -201,7 +204,7 @@ class account_invoice(osv.osv):
             invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
         return invoice_ids
 
-    def _get_invoice_from_reconcile(self, cr, uid, ids, context={}):
+    def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
         move = {}
         for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids):
             for line in r.line_partial_ids:
@@ -316,12 +319,12 @@ class account_invoice(osv.osv):
     _defaults = {
         'type': _get_type,
         #'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'draft',
+        'state': 'draft',
         'journal_id': _get_journal,
         'currency_id': _get_currency,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
-        'reference_type': lambda *a: 'none',
-        'check_total': lambda *a: 0.0,
+        'reference_type': 'none',
+        'check_total': 0.0,
         'user_id': lambda s, cr, u, c: u,
     }
 
@@ -338,16 +341,15 @@ class account_invoice(osv.osv):
                     view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.form')])[0]
         return super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             return res
-        except Exception,e:
+        except Exception, e:
             if '"journal_id" viol' in e.args[0]:
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
-                raise
                 raise orm.except_orm(_('UnknownError'), str(e))
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -766,6 +768,10 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
         context = {}
         for inv in self.browse(cr, uid, ids):
+            if not inv.journal_id.invoice_sequence_id:
+                raise osv.except_osv(_('Error !'), _('Please define invoice sequence on invoice journal'))
+            if not inv.invoice_line:
+                raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
             if inv.move_id:
                 continue
 
@@ -788,6 +794,7 @@ class account_invoice(osv.osv):
             # one move line per tax line
             iml += ait_obj.move_line_get(cr, uid, inv.id)
 
+            entry_type=''
             if inv.type in ('in_invoice', 'in_refund'):
                 ref = inv.reference
                 entry_type = 'journal_pur_voucher'
@@ -918,7 +925,7 @@ class account_invoice(osv.osv):
             if not number:
                 if obj_inv.journal_id.invoice_sequence_id:
                     sid = obj_inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id=%s', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
+                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
                 else:
                     number = self.pool.get('ir.sequence').get(cr, uid,
                             'account.invoice.' + invtype)
@@ -1043,6 +1050,10 @@ class account_invoice(osv.osv):
             tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
             tax_lines = filter(lambda l: l['manual'], tax_lines)
             tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
+            if invoice['type'] == 'in_invoice':
+                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase_refund')])
+            else:
+                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
             if not date :
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
@@ -1051,7 +1062,8 @@ class account_invoice(osv.osv):
                 'state': 'draft',
                 'number': False,
                 'invoice_line': invoice_lines,
-                'tax_line': tax_lines
+                'tax_line': tax_lines,
+                'journal_id': refund_journal_ids
             })
             if period_id :
                 invoice.update({
@@ -1105,7 +1117,6 @@ class account_invoice(osv.osv):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1216,8 +1227,8 @@ class account_invoice_line(osv.osv):
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
     _defaults = {
-        'quantity': lambda *a: 1,
-        'discount': lambda *a: 0.0,
+        'quantity': 1,
+        'discount': 0.0,
         'price_unit': _price_unit_default,
     }
 
@@ -1560,4 +1571,7 @@ class res_partner(osv.osv):
     _columns = {
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
+
 res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/partner.py b/addons/account/partner.py
index bfd74889c1c..cd4d34976d4 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -191,7 +191,4 @@ class res_partner(osv.osv):
     }
 res_partner()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 2d97f1581ca..1c1ae438094 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -10,9 +10,9 @@
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+					<separator string="Mapping" colspan="4"/>
                     <newline/>
-                    <field name="note" colspan="4"/>
-                    <field name="tax_ids" colspan="4" widget="one2many_list">
+                    <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -22,7 +22,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4" widget="one2many_list">
+                    <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -32,6 +32,8 @@
                             <field name="account_dest_id"/>
                         </form>
                     </field>
+                    <separator string="Notes" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/product.py b/addons/account/product.py
index ce91b9b0743..188c3260dff 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -33,7 +33,7 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"),
+            help="This account will be used for invoices to value sales for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
@@ -41,7 +41,7 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"),
+            help="This account will be used for invoices to value expenses for the current product category"),
     }
 product_category()
 
@@ -64,7 +64,7 @@ class product_template(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value incoming stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value sales for the current product"),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
@@ -72,7 +72,7 @@ class product_template(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value outgoing stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
 product_template()
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 067fbd38ab1..f36baf8a07d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -24,7 +24,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Analytic Account">
-            		<group col="8" colspan="4">
+	           		<group col="8" colspan="4">
 	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
 	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
 						<separator orientation="vertical"/>
@@ -32,7 +32,15 @@
 						<field name="code" select="1"/>
 						<field name="partner_id" select="1"/>
 						<field name="user_id" widget="selection"/>
-            		</group>
+	           		</group>
+	            	<newline/>
+	            	<group expand="0" string="Group By...">
+	                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+	                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+	                        <separator orientation="vertical"/>
+	                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+	                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
             	</search>
             </field>
         </record>
@@ -53,6 +61,10 @@
                     <field name="balance"/>
                     <field name="quantity"/>
                     <field name="quantity_max"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <field name="partner_id" invisible="1"/> 
+                    <field name="user_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -148,7 +160,7 @@
                     <field name="journal_id" select="2"/>
                     <field name="general_account_id" select="2"/>
                     <field name="move_id" select="2"/>
-                <separator string="Optionnal Information" colspan="4"/>
+                <separator string="Optional Information" colspan="4"/>
                     <field name="unit_amount" select="2"/>
                     <field name="ref" select="2"/>
                     <field name="currency_id" select="2"/>
@@ -195,6 +207,13 @@
                         <field name="date" select="1"/>
                         <field name="user_id" widget="selection"/>
             		</group>
+            		<newline/>
+            		<group string="Group By..." expand="0">
+            			<filter string="General Account" context="{'group_by':'general_account_id'}"/>
+                    	<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                    	<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
+                    	<filter string="Product" context="{'group_by':'product_id'}"/>
+            		</group>
             	</search>
             </field>
         </record>
@@ -278,6 +297,19 @@
             </field>
         </record>
 
+		<record id="view_analytic_journal_search" model="ir.ui.view">
+            <field name="name">account.analytic.journal.search</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="analytic Journals">
+	            	<group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+            	</search>
+            </field>
+        </record>
+
         <record id="view_account_analytic_journal_form" model="ir.ui.view">
             <field name="name">account.analytic.journal.form</field>
             <field name="model">account.analytic.journal</field>
@@ -296,7 +328,7 @@
             <field name="name">Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
         <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
 
@@ -309,7 +341,6 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
         <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
         <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
@@ -321,7 +352,7 @@
         </record> -->
 <!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
          <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">Checks Register</field>
+            <field name="name">Check Registers</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 1ad974e8650..204bb7c8de8 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -7,18 +7,20 @@
 			<field name="model">account.analytic.cost.ledger.journal.report</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<form string="Select period">
-					<separator string="Cost Legder for period" colspan="4"/>
-					<field name="date1"/>
-					<field name="date2"/>
-					<separator string="and Journals" colspan="4"/>
-					<field name="journal" colspan="4"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
+                <form string="Select period">
+	               <group width="450">
+	                   <separator string="Cost Legder for period" colspan="4"/>
+	                   <field name="date1"/>
+	                   <field name="date2"/>
+	                   <separator string="and Journals" colspan="4"/>
+	                   <field name="journal" colspan="4" nolabel="1"/>
+	                   <separator colspan="4"/>
+	                   <group colspan="4" col="6">
+	                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+	                   </group>
+	               </group>
+                </form>
 			</field>
 		</record>
 
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index e3b6b946300..d2b6b44f2d6 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -123,11 +123,7 @@ class account_balance(report_sxw.rml_parse):
         child_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, ids, ctx)
         if child_ids:
             ids = child_ids
-        print 'on va faire un read'
         accounts = self.pool.get('account.account').read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id'], ctx)
-        print 'on a fait un read'
-        import pdb
-        pdb.set_trace()
         for account in accounts:
             if account['id'] in done:
                 continue
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 2b37b553075..1892072f251 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="account_balance.pdf">
+  <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP SA" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
 	  <pageGraphics>
@@ -244,12 +244,12 @@
         <td><para style="P10">Credit</para></td>
         <td><para style="P10">Balance</para></td>
       </tr>
-      <tr>
-		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<!--<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i>--></para></td>
-        <td><para style="P14"><!--<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font>--></para></td>
-        <td><para style="P3"><!--<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font>--></para></td>
-        <td><para style="P3"><!--<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font>--></para></td>
-        <td><para style="P3"><!--<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font>--></para></td>
+      <tr> [[ repeatIn(lines(data['form']), 'a') ]]
+		<td><para style="P14"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><i>[[ a['code'] and a['code'] or removeParentNode('tr')  ]]</i></para></td>
+        <td><para style="P14"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
       </tr>
     </blockTable>
   </story>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 826e2076033..25673dff42c 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -27,8 +27,6 @@
 "access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_wizard_multi_charts_accounts","wizard.multi.charts.accounts","model_wizard_multi_charts_accounts","account.group_account_manager",1,1,1,1
-"access_account_bank_accounts_wizard","account.bank.accounts.wizard","model_account_bank_accounts_wizard","account.group_account_manager",1,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
@@ -66,8 +64,6 @@
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
-"access_account_add_tmpl_wizard_account_manager","account.addtmpl.wizard account manager","model_account_addtmpl_wizard","group_account_manager",1,1,1,1
-"access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
@@ -85,7 +81,6 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_account_installer","account.installer","model_account_installer","base.group_system",1,1,1,1
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
 "access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
@@ -93,13 +88,3 @@
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
-"access_project_account_analytic_line","project.account.analytic.line","model_project_account_analytic_line","account.group_account_manager",1,1,1,1
-"access_account_move_line_reconcile_select","account.move.line.reconcile.select","model_account_move_line_reconcile_select","account.group_account_manager",1,1,1,1
-"access_account_move_line_unreconcile_select","account.move.line.unreconcile.select","model_account_move_line_unreconcile_select","account.group_account_manager",1,1,1,1
-"access_account_invoice_refund","account.invoice.refund","model_account_invoice_refund","account.group_account_manager",1,1,1,1
-"access_account_move_journal","account.move.journal","model_account_move_journal","account.group_account_manager",1,1,1,1
-"access_account_move_bank_reconcile","account.move.bank.reconcile","model_account_move_bank_reconcile","account.group_account_manager",1,1,1,1
-"access_account_subscription_generate","account.subscription.generate","model_account_subscription_generate","account.group_account_manager",1,1,1,1
-"access_account_period_close","account.period.close","model_account_period_close","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear_close_state","account.fiscalyear.close.state","model_account_fiscalyear_close_state","account.group_account_manager",1,1,1,1
-"access_account_chart","account.chart","model_account_chart","account.group_account_manager",1,1,1,1
diff --git a/addons/account/wizard/account_balance_report.py b/addons/account/wizard/account_balance_report.py
index 8d826173ae0..bf0b264d73d 100644
--- a/addons/account/wizard/account_balance_report.py
+++ b/addons/account/wizard/account_balance_report.py
@@ -58,8 +58,8 @@ class account_balance_report(osv.osv_memory):
 #        return result
 
     def _print_report(self, cr, uid, ids, data, query_line, context=None):
-        data['form'].update(self.read(cr, uid, ids, ['display_account',  'company_id',])[0])
-        data['form']['query_line'] = query_line
+        data['form'].update(self.read(cr, uid, ids, ['display_account',])[0])
+        data['form']['query_line'] = query_line + ' AND l.journal_id in (%s)' % ','.join(map(str, data['form']['journal_ids']))
         return { 'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data, 'nodestroy':True, }
 
 account_balance_report()
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 276f8e1dd65..f6c1854bc3d 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -21,32 +21,30 @@
 
 
 {
-    'name': 'report_account_analytic',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'name'      : 'report_account_analytic',
+    'version'   : '1.1',
+    'category'  : 'Generic Modules/Accounting',
     'description': """
-    This module is for modifying account analytic view to show
-    important data to project manager of services companies.
-    Adds menu to show relevant information to each manager..
+This module is for modifying account analytic view to show
+important data to project manager of services companies.
+Adds menu to show relevant information to each manager..
 
-    You can also view the report of account analytic summary
-    user-wise as well as month wise.
+You can also view the report of account analytic summary
+user-wise as well as month wise.
 """,
-    "version" : "1.1",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Accounting",
-    "module": "",
-    "website": "http://www.camptocamp.com/",
-    "depends" : ["account","hr_timesheet","hr_timesheet_invoice","project"],
-    "init_xml" : [],
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "account_analytic_analysis_view.xml",
-        "account_analytic_analysis_menu.xml",
-    ],
-    'demo_xml': [],
+    "author"    : "Camptocamp",
+    "website"   : "http://www.camptocamp.com/",
+    "depends"   : ["hr_timesheet_invoice"],
+    "init_xml"  : [],
+    "update_xml": [
+                    "security/ir.model.access.csv",
+                    "account_analytic_analysis_view.xml",
+                    "account_analytic_analysis_menu.xml",
+                    ],
+    'demo_xml'  : [],
     'installable': True,
-    'active': False,
+    'active'    : False,
     'certificate': '0042927202589',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index dc2ada7aea9..4ad34f5b2cc 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -19,18 +19,16 @@
 #
 ##############################################################################
 
-import operator
 from osv import osv, fields
 from osv.orm import intersect
 import tools.sql
 from tools.translate import _
 
-
 class account_analytic_account(osv.osv):
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
-    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -46,7 +44,7 @@ class account_analytic_account(osv.osv):
                 
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
 
-    def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         res2 = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
@@ -92,7 +90,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
         return res
 
-    def _hours_qtt_non_invoiced_calc (self, cr, uid, ids, name, arg, context={}):
+    def _hours_qtt_non_invoiced_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -117,7 +115,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _hours_quantity_calc(self, cr, uid, ids, name, arg, context={}):
+    def _hours_quantity_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -141,7 +139,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _total_cost_calc(self, cr, uid, ids, name, arg, context={}):
+    def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -158,7 +156,7 @@ class account_analytic_account(osv.osv):
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
  
     # TODO Take care of pricelist and purchase !
-    def _ca_theorical_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_theorical_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         res2 = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
@@ -202,7 +200,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
         return res
 
-    def _last_worked_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_worked_date_calc (self, cr, uid, ids, name, arg, context = None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -223,7 +221,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _last_invoice_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_invoice_date_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -247,7 +245,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _last_worked_invoiced_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_worked_invoiced_date_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -268,7 +266,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context={}):
+    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.quantity_max != 0:
@@ -279,7 +277,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.hours_quantity - account.hours_qtt_non_invoiced
@@ -289,7 +287,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context={}):
+    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.hours_qtt_invoiced == 0:
@@ -300,7 +298,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.ca_invoiced == 0:
@@ -313,7 +311,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context={}):
+    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.amount_max != 0:
@@ -324,7 +322,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.ca_invoiced + account.total_cost
@@ -332,7 +330,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.ca_theorical + account.total_cost
@@ -426,6 +424,7 @@ class account_analytic_account_summary_user(osv.osv):
             string='Total Time'),
         'user' : fields.many2one('res.users', 'User'),
     }
+    
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
         cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -731,6 +730,5 @@ class account_analytic_account_summary_month(osv.osv):
 
 account_analytic_account_summary_month()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 772c01ab07c..7a7dbff602b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,7 +1,6 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-<!--        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
         <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
@@ -14,17 +13,6 @@
         </record>
         <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
 
-        <record id="action_account_analytic_all" model="ir.actions.act_window">
-            <field name="name">All Analytic Accounts</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="view_id" ref="account.view_account_analytic_account_list"/>
-            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
-            <field name="domain">[]</field>
-        </record>
-<!--        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>-->
-
         <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
             <field name="name">Overpassed Accounts</field>
             <field name="res_model">account.analytic.account</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 64c71c1a2e2..a82f3b1b5c9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -24,7 +24,6 @@
                         <field name="ca_invoiced"/>
                         <field name="ca_theorical"/>
                         <newline/>
-                        <!-- <field name="old"/> -->
                         <field name="hours_quantity"/>
                         <field name="hours_qtt_invoiced"/>
                         <field name="remaining_hours"/>
@@ -38,13 +37,12 @@
                         <separator colspan="4" string="Key dates"/>
 
                         <field name="last_invoice_date"/>
-
                         <field name="last_worked_invoiced_date"/>
                         <field name="last_worked_date"/>
                         <separator colspan="4" string="To be invoiced"/>
+                        
                         <field name="hours_qtt_non_invoiced"/>
                         <field name="ca_to_invoice"/>
-
                     </page>
                     <page string="Stats by month">
                         <field colspan="4" name="month_ids" nolabel="1">
@@ -81,20 +79,18 @@
                 </field>
             </field>
         </record>
+        
         <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view"> 
             <field name="name">account.analytic.account.tree</field> 
             <field name="model">account.analytic.account</field> 
             <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-
             <field name="type">tree</field> 
             <field name="arch" type="xml"> 
                 <field name="date" position="before"> 
                     <field name="last_invoice_date"/>
                     <field name="ca_to_invoice"/>
                 </field>
-
             </field>
-
         </record>
 
         <record id="view_account_analytic_simplified" model="ir.ui.view">
@@ -110,7 +106,6 @@
                     <field name="remaining_hours"/>
                     <field name="ca_to_invoice"/>
                     <field name="last_invoice_date"/>
-
                 </tree>
             </field>
         </record>
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 3deb56e7e65..d847419e188 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:50+0000\n"
-"Last-Translator: Tor Syversen <sol-moe@online.no>\n"
+"PO-Revision-Date: 2010-07-03 18:41+0000\n"
+"Last-Translator: Mathias Bøhn Grytemark <Unknown>\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: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -32,7 +32,7 @@ msgstr "Timer, summert pr. bruker"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Forrige fakturadato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -58,7 +58,7 @@ msgstr "Mine nåværende konti"
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ugyldig XML for visningsarkitektur!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -84,7 +84,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -123,7 +123,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Gjenværende timer"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -159,7 +159,7 @@ msgstr ""
 #: field:account.analytic.account,user_ids:0
 #: field:account_analytic_analysis.summary.user,user:0
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
@@ -182,7 +182,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Mine kontoer"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -195,7 +195,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr ""
+msgstr "Ufakturerte timer"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
diff --git a/addons/account_analytic_default/__init__.py b/addons/account_analytic_default/__init__.py
index 5206ec18324..1734f02dc57 100644
--- a/addons/account_analytic_default/__init__.py
+++ b/addons/account_analytic_default/__init__.py
@@ -20,4 +20,5 @@
 ##############################################################################
 
 import account_analytic_default
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 9c3982990b3..537721a112e 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -19,11 +19,10 @@
 #
 ##############################################################################
 
-
 {
-    'name': 'Account Analytic Default',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'name'      : 'Account Analytic Default',
+    'version'   : '1.0',
+    'category'  : 'Generic Modules/Accounting',
     'description': """
 Allows to automatically select analytic accounts based on criterions:
 * Product
@@ -32,14 +31,15 @@ Allows to automatically select analytic accounts based on criterions:
 * Company
 * Date
     """,
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'sale'],
-    'init_xml': [],
+    'author'    : 'Tiny',
+    'website'   : 'http://www.openerp.com',
+    'depends'   : ['account', 'sale'],
+    'init_xml'  : [],
     'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'],
-    'demo_xml': [],
+    'demo_xml'  : [],
     'installable': True,
     'active': False,
     'certificate': '0074229833581',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 1db16ca8787..6df4ed83614 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from osv import orm
 import time
 
+from osv import fields,osv
+
 class account_analytic_default(osv.osv):
     _name = 'account.analytic.default'
     _description = 'Analytic Distribution'
@@ -38,7 +38,7 @@ class account_analytic_default(osv.osv):
         'date_start': fields.date('Start Date'),
         'date_stop': fields.date('End Date'),
     }
-    def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context={}):
+    def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):
         domain = []
         if product_id:
             domain += ['|',('product_id','=',product_id)]
@@ -71,7 +71,7 @@ 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=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
         if rec:
@@ -101,7 +101,7 @@ class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
 
     # Method overridden to set the analytic account by default on criterion match
-    def invoice_line_create(self, cr, uid, ids, context={}):
+    def invoice_line_create(self, cr, uid, ids, context=None):
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
         if not ids:
             return create_ids
@@ -117,6 +117,4 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 6eda0241eea..d49fa04dffb 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults" editable="bottom">
+                <tree string="Analytic Defaults">
                     <field name="sequence"/>
                     <field name="analytic_id" required="1"/>
                     <field name="product_id"/>
@@ -18,17 +18,18 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_account_analytic_default_form" model="ir.ui.view">
             <field name="name">account.analytic.default.form</field>
             <field name="model">account.analytic.default</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" select="1" required="1"/>
+                    <field name="analytic_id" required="1"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
-                    <field name="product_id" select="1"/>
-                    <field name="partner_id" select="1"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="date_start"/>
@@ -36,19 +37,37 @@
                 </form>
             </field>
         </record>
+
+        <record id="view_account_analytic_default_form_search" model="ir.ui.view">
+            <field name="name">account.analytic.default.search</field>
+            <field name="model">account.analytic.default</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Accounts">
+                    <field name="analytic_id"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id"/>
+                </search>
+            </field>
+        </record>
+        
         <record id="action_analytic_default_form" model="ir.actions.act_window">
             <field name="name">Analytic Defaults</field>
             <field name="res_model">account.analytic.default</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
         </record>
-<!--        <menuitem-->
-<!--            action="action_analytic_default_form"-->
-<!--            id="menu_analytic_defaul_form"-->
-<!--            parent="account.menu_analytic_accounting"/>-->
 
         <act_window
-            domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
+            name="Entries"
+            id="act_account_acount_move_line_open"
+            res_model="account.move.line"
+            src_model="account.account"
+            domain="[('account_id', '=', active_id)]"/>
+
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_partner"
@@ -56,12 +75,14 @@
             src_model="res.partner"
             domain="[('partner_id','=',active_id)]"
             groups="base.group_extended"/>
+
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_user"
             res_model="account.analytic.default"
             src_model="res.users"
             domain="[('user_id','=',active_id)]"/>
+
         <act_window
             name="Analytic Rules"
             res_model="account.analytic.default"
diff --git a/addons/account_analytic_plans/__init__.py b/addons/account_analytic_plans/__init__.py
index 213f9fe6da4..067aa84d267 100644
--- a/addons/account_analytic_plans/__init__.py
+++ b/addons/account_analytic_plans/__init__.py
@@ -22,5 +22,6 @@
 import account_analytic_plans
 import wizard
 import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 0f23bc379be..28fd154b039 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Multiple-plans management in Analytic Accounting',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'name'      : 'Multiple-plans management in Analytic Accounting',
+    'version'   : '1.0',
+    'category'  : 'Generic Modules/Accounting',
     'description': """This module allows to use several analytic plans, according to the general journal,
 so that multiple analytic lines are created when the invoice or the entries
 are confirmed.
@@ -54,10 +54,10 @@ for one account entry.
 The analytic plan validates the minimum and maximum percentage at the time of creation
 of distribution models.
         """,
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'account_analytic_default'],
-    'init_xml': [],
+    'author'    : 'Tiny',
+    'website'   : 'http://www.openerp.com',
+    'depends'   : ['account', 'account_analytic_default'],
+    'init_xml'  : [],
     'update_xml': [
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
@@ -65,9 +65,10 @@ of distribution models.
         'wizard/analytic_plan_create_model_view.xml',
         'wizard/account_crossovered_analytic_view.xml'
     ],
-    'demo_xml': [],
+    'demo_xml'  : [],
     'installable': True,
-    'active': False,
+    'active'    : False,
     'certificate': '0036417675373',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index a1bcd6201c1..0cfbac974e6 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -19,15 +19,9 @@
 #
 ##############################################################################
 from lxml import etree
-
-from mx import DateTime
-from mx.DateTime import now
 import time
 
-import netsvc
-from osv import fields, osv,orm
-import ir
-
+from osv import fields, osv
 import tools
 from tools.translate import _
 
@@ -64,6 +58,7 @@ account_analytic_plan()
 class account_analytic_plan_line(osv.osv):
     _name = "account.analytic.plan.line"
     _description = "Analytic Plan Line"
+    _order = "sequence, id"
     _columns = {
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
@@ -73,16 +68,15 @@ class account_analytic_plan_line(osv.osv):
         'max_required': fields.float('Maximum Allowed (%)'),
     }
     _defaults = {
-        'min_required': lambda *args: 100.0,
-        'max_required': lambda *args: 100.0,
+        'min_required': 100.0,
+        'max_required': 100.0,
     }
-    _order = "sequence,id"
 account_analytic_plan_line()
 
 class account_analytic_plan_instance(osv.osv):
-    _name='account.analytic.plan.instance'
+    _name = 'account.analytic.plan.instance'
     _description = 'Analytic Plan Instance'
-    _columns={
+    _columns = {
         'name':fields.char('Analytic Distribution', size=64),
         'code':fields.char('Distribution Code', size=16),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal' ),
@@ -116,7 +110,9 @@ class account_analytic_plan_instance(osv.osv):
                 'account4_ids':False, 'account5_ids':False, 'account6_ids':False})
         return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context)
 
-    def _default_journal(self, cr, uid, context={}):
+    def _default_journal(self, cr, uid, context=None):
+        if not context:
+            context = {}
         if context.has_key('journal_id') and context['journal_id']:
             journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
             if journal.analytic_journal_id:
@@ -124,10 +120,10 @@ class account_analytic_plan_instance(osv.osv):
         return False
 
     _defaults = {
-        'plan_id': lambda *args: False,
+        'plan_id': False,
         'journal_id': _default_journal,
     }
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         res = []
         for inst in self.browse(cr, uid, ids, context):
             name = inst.name or '/'
@@ -207,7 +203,7 @@ class account_analytic_plan_instance(osv.osv):
 
         return super(account_analytic_plan_instance, self).create(cr, uid, vals, context)
 
-    def write(self, cr, uid, ids, vals, context={}, check=True, update_check=True):
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         this = self.browse(cr, uid, ids[0])
         if this.plan_id and not vals.has_key('plan_id'):
             #this instance is a model, so we have to create a new plan instance instead of modifying it
@@ -237,9 +233,9 @@ class account_analytic_plan_instance_line(osv.osv):
         'rate':fields.float('Rate (%)', required=True),
     }
     _defaults = {
-        'rate': lambda *args: 100.0
+        'rate': 100.0
     }
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
         reads = self.read(cr, uid, ids, ['analytic_account_id'], context)
@@ -297,7 +293,7 @@ class account_move_line(osv.osv):
             del(data['analytics_id'])
         return data
 
-    def create_analytic_lines(self, cr, uid, ids, context={}):
+    def create_analytic_lines(self, cr, uid, ids, context=None):
         super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
         analytic_line_obj = self.pool.get('account.analytic.line')
         for line in self.browse(cr, uid, ids, context):
@@ -333,7 +329,7 @@ class account_invoice(osv.osv):
     _name = "account.invoice"
     _inherit="account.invoice"
 
-    def line_get_convert(self, cr, uid, x, part, date, context={}):
+    def line_get_convert(self, cr, uid, x, part, date, context=None):
         res=super(account_invoice,self).line_get_convert(cr, uid, x, part, date, context)
         res['analytics_id']=x.get('analytics_id',False)
         return res
@@ -399,7 +395,7 @@ class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
 
     # Method overridden to set the analytic account by default on criterion match
-    def invoice_line_create(self, cr, uid, ids, context={}):
+    def invoice_line_create(self, cr, uid, ids, context=None):
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
         if ids:
             sale_line_obj = self.browse(cr, uid, ids[0], context)
diff --git a/addons/account_analytic_plans/account_analytic_plans_report.xml b/addons/account_analytic_plans/account_analytic_plans_report.xml
index ee2bb1e2a87..663e0eeab13 100644
--- a/addons/account_analytic_plans/account_analytic_plans_report.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_report.xml
@@ -11,13 +11,6 @@
 			auto="False"
 			menu="False"/>
 
-		<!--<wizard
-			id="account_analytic_account_inverted_balance_report"
-			string="Crossovered Analytic"
-			model="account.analytic.account"
-			name="wizard.crossovered.analytic"
-			keyword="client_print_multi"/>-->
-
 	</data>
 </openerp>
 
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 656b9105210..d5085b009da 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -89,7 +89,11 @@
                 <field name="code" select="1"/>
                 <field name="plan_id" required="True"/>
                 <field name="journal_id"/>
-                <field name="account_ids" string="Analytic Distribution" colspan="4">
+                <field name="account_ids" nolabel="1" colspan="4">
+                	<form string="Analytic Distribution">
+                        <field name="rate"/>
+                        <field name="analytic_account_id"/>
+                    </form>
                     <tree string="Analytic Distribution" editable="bottom">
                         <field name="rate"/>
                         <field name="analytic_account_id"/>
@@ -124,16 +128,11 @@
 
     <act_window name="Distribution Models"
         domain="[('plan_id', '=', active_id),('plan_id','&lt;&gt;',False)]"
-        context="{'plan_id': active_id}"
+        context="{'plan_id':active_id}"
         res_model="account.analytic.plan.instance"
         src_model="account.analytic.plan"
         id="account_analytic_instance_model_open"/>
-
-<!--    <menuitem-->
-<!--        name="Analytic Distribution's models" parent="account.account_def_analytic_journal"-->
-<!--        id="menu_account_analytic_plan_instance_action"-->
-<!--        action="account_analytic_plan_instance_action"/>-->
-
+        
     <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
         <field name="name">account.analytic.plan.instance.line.form</field>
         <field name="model">account.analytic.plan.instance.line</field>
@@ -168,7 +167,7 @@
             <form string="Analytic Plan">
                 <field name="name" select="1"/>
                 <field name="default_instance_id"/>
-                <field name="plan_ids" colspan="4"/>
+                <field name="plan_ids" colspan="4" nolabel="1"/>
             </form>
         </field>
     </record>
@@ -192,7 +191,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-	
+
 	<menuitem
         parent="account.menu_analytic"
         name="Multi Plans"
@@ -201,7 +200,7 @@
      <menuitem
          parent="menu_account_analytic_multi_plan_action"
          id="menu_account_analytic_plan_action"
-         action="account_analytic_plan_form_action"/>	
+         action="account_analytic_plan_form_action"/>
 
     <record model="ir.ui.view" id="account_analytic_plan_line_form">
         <field name="name">account.analytic.plan.line.form</field>
@@ -234,7 +233,7 @@
         </field>
     </record>
 
-    <!-- add property field on product -->
+    <!-- add property field on default analytic account-->
 
         <record model="ir.ui.view" id="view_default_inherit_form">
             <field name="name">account.analytic.default.form.plans</field>
diff --git a/addons/account_analytic_plans/report/__init__.py b/addons/account_analytic_plans/report/__init__.py
index 512ea3239d2..2d401a6f1d8 100644
--- a/addons/account_analytic_plans/report/__init__.py
+++ b/addons/account_analytic_plans/report/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import crossovered_analytic
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 8f5d4b33317..e0414e4c954 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -19,20 +19,20 @@
 #
 ##############################################################################
 
-import pooler
 import time
+
 from report import report_sxw
 
 class crossovered_analytic(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(crossovered_analytic, self).__init__(cr, uid, name, context=context)
+        super(crossovered_analytic, self).__init__(cr, uid, name, context = context)
         self.localcontext.update( {
             'time': time,
             'lines': self._lines,
             'ref_lines' : self._ref_lines,
             'find_children':self.find_children,
         })
-        self.base_amount=0.00
+        self.base_amount = 0.00
 
     def find_children(self,ref_ids):
         to_return_ids = []
@@ -153,23 +153,23 @@ class crossovered_analytic(report_sxw.rml_parse):
                     if not form['empty_line']:
                         res.append(result)
             else:
-                result={}
-                res=[]
-                result['id']=acc_id
+                result = {}
+                res = []
+                result['id'] = acc_id
                 data_account = acc_pool.browse(self.cr,self.uid,acc_id)
-                result['acc_name']=data_account.name
+                result['acc_name'] = data_account.name
                 result['code'] = data_account.code
-                result['amt']=result['qty']=result['perc']=0.00
+                result['amt'] = result['qty'] = result['perc'] = 0.00
                 if not form['empty_line']:
                     res.append(result)
 
             for item in res:
-                obj_acc=acc_pool.name_get(self.cr,self.uid,[item['id']])
-                item['acc_name']=obj_acc[0][1]
+                obj_acc = acc_pool.name_get(self.cr,self.uid,[item['id']])
+                item['acc_name'] = obj_acc[0][1]
                 final.append(item)
         return final
 
-report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser=crossovered_analytic, header=False)
+report_sxw.report_sxw('report.account.analytic.account.crossovered.analytic', 'account.analytic.account', 'addons/account_analytic_plans/report/crossovered_analytic.rml',parser = crossovered_analytic, header = False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/wizard/__init__.py b/addons/account_analytic_plans/wizard/__init__.py
index c91a0251b33..f5c73701ae1 100644
--- a/addons/account_analytic_plans/wizard/__init__.py
+++ b/addons/account_analytic_plans/wizard/__init__.py
@@ -21,5 +21,6 @@
 
 import analytic_plan_create_model
 import account_crossovered_analytic
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 8c860169f56..5b20c2a6448 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,17 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Crossovered Analytic">
-			    <group col="4" colspan="6">
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <field name="ref" colspan="4"/>
-				    <field name="journal_ids" colspan="4"/>
-				    <field name="empty_line"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+				<group height="280" width="300">
+				    <group col="4" colspan="6">
+					    <field name="date1"/>
+					    <field name="date2"/>
+					    <field name="ref" colspan="4"/>
+					    <field name="journal_ids" colspan="4"/>
+					    <field name="empty_line"/>
+					</group>
+					<separator colspan="4"/>
+				    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index a99ce35d3b2..81c5e67f961 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -75,11 +75,6 @@
                         <page string="Accounts">
                             <field name="account_ids" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Dotations">
-                            <button string="Spread" name="%(action_account_budget_spread)d" type="action" icon="gtk-fullscreen"/>
-                            <field name="dotation_ids" colspan="4" nolabel="1"/>
-                        </page>
-
                         <page string="Budget Lines">
                             <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
                                 <graph type="bar" string="Lines">
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index fd6886040a0..645b13a9511 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,12 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Select Dates Period">
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                    <group width="450">
+                        <separator string="This wizard is used to print budget" colspan="4"/>
+					    <field name="date_from"/>
+					    <field name="date_to"/>
+					    <separator colspan="4"/>
+					    <group colspan="4" col="6">
+		 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+		           			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+						</group>
  					</group>
 				</form>
 			</field>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 494c9af31ab..8bcd2445c67 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,12 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Select Dates Period">
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+	                <group width="450">
+	                	<separator string="This wizard is used to print budget" colspan="4"/>
+					    <field name="date_from"/>
+					    <field name="date_to"/>
+					    <separator colspan="4"/>
+					    <group colspan="4" col="6">
+	     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ 						</group>
  					</group>
 				</form>
 			</field>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index cb6c162fd57..44401a71978 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,13 +8,16 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Select Dates Period">
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
+					<group width="450">
+					<separator string="This wizard is used to print summary of budgets" colspan="4"/>
+					<field name="date_from"/>
+					<field name="date_to"/>
+					<separator colspan="4"/>
+						<group colspan="4" col="6">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+						</group>
+					</group>
 				</form>
 			</field>
 		</record>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index 3587a20dcba..8508637859a 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -8,13 +8,16 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Select Dates Period">
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
+					<group width="450">
+					<separator string="Print Budgets" colspan="4"/>
+					<field name="date1"/>
+					<field name="date2"/>
+					<separator colspan="4"/>
+						<group colspan="4" col="6">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+						</group>
+					</group>
 				</form>
 			</field>
 		</record>
diff --git a/addons/account_budget/wizard/account_budget_spread_view.xml b/addons/account_budget/wizard/account_budget_spread_view.xml
index 21cf6551452..2d6b5996fee 100644
--- a/addons/account_budget/wizard/account_budget_spread_view.xml
+++ b/addons/account_budget/wizard/account_budget_spread_view.xml
@@ -7,14 +7,16 @@
              <field name="model">account.budget.spread</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-				    <field name="fiscalyear"/>
-				    <field name="amount"/>
-				    <separator colspan="4"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_spread" string="Ok" type="object" icon="gtk-ok" default_focus="1"/>
+	             <form string="Select Fiscalyear">
+					<group width="480">
+						<separator string="" colspan="4"/>
+					    <field name="fiscalyear"/>
+					    <field name="amount"/>
+					    <separator colspan="4"/>
+					    <group colspan="4" col="6">
+	     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               			<button name="check_spread" string="Ok" type="object" icon="gtk-ok"/>
+	 					</group>
  					</group>
 				</form>
 			</field>
diff --git a/addons/account_coda/__init__.py b/addons/account_coda/__init__.py
index af866f5dc70..8f76e8912b4 100644
--- a/addons/account_coda/__init__.py
+++ b/addons/account_coda/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import coda
+import account_coda
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 306098d137b..5582955bf4f 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 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/>.
 #
 ##############################################################################
 
@@ -24,13 +24,16 @@
     "version":"1.0",
     "author":"Tiny",
     "category":"Account CODA",
-    "description":"""Module provides functionality to import
+    "description":"""
+    Module provides functionality to import
     bank statements from coda files.
     """,
     "depends":["base", "account"],
-    "demo_xml":["coda_demo.xml"],
+    "demo_xml":["account_coda_demo.xml"],
     "init_xml":[],
-    "update_xml" : ["security/ir.model.access.csv","coda_wizard.xml","coda_view.xml"],
+    "update_xml" : ["security/ir.model.access.csv",
+                    "wizard/account_coda_import.xml",
+                    "account_coda_view.xml"],
     "active":False,
     "installable":True,
 
diff --git a/addons/account_coda/coda.py b/addons/account_coda/account_coda.py
similarity index 80%
rename from addons/account_coda/coda.py
rename to addons/account_coda/account_coda.py
index 26c216583a3..1cfd75ffb63 100644
--- a/addons/account_coda/coda.py
+++ b/addons/account_coda/account_coda.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 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/>.
 #
 ##############################################################################
 
@@ -26,15 +26,15 @@ class account_coda(osv.osv):
     _name = "account.coda"
     _description = "coda for an Account"
     _columns = {
-        'name': fields.binary('Coda file', readonly=True),
-        'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statement', readonly=True),
+        'name': fields.binary('Coda file', readonly=True ,help="Store the detail of  bank statements"),
+        'statement_ids': fields.one2many('account.bank.statement','coda_id','Generated Bank Statements', readonly=True),
         'note': fields.text('Import log', readonly=True),
-        'journal_id': fields.many2one('account.journal','Bank Journal', readonly=True, select=True),
-        'date': fields.date('Import Date', readonly=True, select=True),
+        'journal_id': fields.many2one('account.journal','Journal', readonly=True, select=True,help="Bank Journal"),
+        'date': fields.date('Date', readonly=True, select=True, help="Import Date"),
         'user_id': fields.many2one('res.users','User', readonly=True, select=True),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr,uid,context: uid,
     }
 account_coda()
diff --git a/addons/account_coda/coda_demo.xml b/addons/account_coda/account_coda_demo.xml
similarity index 100%
rename from addons/account_coda/coda_demo.xml
rename to addons/account_coda/account_coda_demo.xml
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
new file mode 100644
index 00000000000..30d8a22cb5d
--- /dev/null
+++ b/addons/account_coda/account_coda_view.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+	<record model="ir.ui.view" id="view_account_coda_form">
+		<field name="name">account.coda.form</field>
+		<field name="model">account.coda</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Coda import">
+				<field name="name" />
+				<field name="journal_id" />
+				<field name="date" />
+				<field name="user_id" />
+				<notebook colspan="4">
+					<page string="Log">
+					   <field name="note" colspan="4" nolabel="1"/>
+					</page>
+					<page string="Statements">
+					   <field name="statement_ids" colspan="4" nolabel="1"/>
+					</page>
+				</notebook>
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_account_coda_tree">
+		<field name="name">account.coda.tree</field>
+		<field name="model">account.coda</field>
+		<field name="type">tree</field>
+		<field name="arch" type="xml">
+			<tree string="Coda import">
+				<field name="journal_id" />
+				<field name="date" />
+				<field name="user_id" />
+				<field name="statement_ids"/>
+			</tree>
+		</field>
+	</record>
+
+      <record id="view_aaccount_coda_filter" model="ir.ui.view">
+            <field name="name">account.coda.select</field>
+            <field name="model">account.coda</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Coda">
+                   <group col="10" colspan="4">
+                        <field name="journal_id"/>
+                        <field name="user_id" default="uid"/>
+                        <field name="date"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
+	<record model="ir.actions.act_window" id="action_account_coda">
+		<field name="name">Coda Statements</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">account.coda</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
+		<field name="search_view_id" ref="view_aaccount_coda_filter"/>
+	</record>
+
+	<menuitem name="Coda Statements" parent="account.menu_finance_periodical_processing" id="menu_account_coda"  sequence="12"/>
+
+	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
+
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
+	 id="menu_account_coda_import" sequence="13"/>
+
+	<act_window name="Coda File"
+		domain="[('statement_ids', 'in', [active_id])]"
+		res_model="account.coda"
+		src_model="account.bank.statement"
+		view_type="form"
+		view_mode="tree,form"
+ 		id="act_account_payment_account_bank_statement"/>
+
+	</data>
+</openerp>
diff --git a/addons/account_coda/coda_view.xml b/addons/account_coda/coda_view.xml
deleted file mode 100644
index 3813fe40bf0..00000000000
--- a/addons/account_coda/coda_view.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-<data>
-
-	<record model="ir.ui.view" id="view_account_coda_form">
-		<field name="name">account.coda.form</field>
-		<field name="model">account.coda</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Coda import">
-				<field name="name" />
-				<field name="journal_id" />
-				<field name="date" />
-				<field name="user_id" />
-                                <notebook colspan="4">
-                                    <page string="Log">
-                                       <field name="note" colspan="4"/>
-                                    </page>    
-                                    <page string="Statements">
-                                       <field name="statement_ids" colspan="4"/>
-                                    </page>
-                                </notebook>
-			</form>
-		</field>
-	</record>
-
-
-	<record model="ir.ui.view" id="view_account_coda_tree">
-		<field name="name">account.coda.tree</field>
-		<field name="model">account.coda</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Coda import">
-				<field name="journal_id" />
-				<field name="date" />
-				<field name="user_id" />
-			</tree>
-		</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_account_coda">
-		<field name="name">Coda import</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">account.coda</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-
-	<menuitem name="Coda Statements" parent="account.menu_finance_reporting" id="menu_account_coda" action="action_account_coda" sequence="12"/>
-
-	<menuitem name="Import Coda Statements" action="wizard_account_coda_import" parent="account.menu_finance_periodical_processing"
-	type="wizard"  id="menu_account_coda_wizard" sequence="15"/>
-
-	<act_window name="Coda File"
-		domain="[('statement_ids', 'in', [active_id])]"
-		res_model="account.coda"
-		src_model="account.bank.statement"
-		view_type="form"
-		view_mode="tree,form"
- 		id="act_account_payment_account_bank_statement"/>
-
-	</data>
-</openerp>
diff --git a/addons/account_coda/coda_wizard.xml b/addons/account_coda/coda_wizard.xml
deleted file mode 100644
index ecd8eb65913..00000000000
--- a/addons/account_coda/coda_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<wizard
-		string="Import Coda File"
-		model="account.bank.statement"
-		name="account.coda_import"
-		id="wizard_account_coda_import"
-		menu="False"
-		/>
-	</data>
-</openerp>
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 9c1e0a486dc..3ab8dccd4ad 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
\ No newline at end of file
+"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
+"access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
+"access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
diff --git a/addons/account_coda/wizard/__init__.py b/addons/account_coda/wizard/__init__.py
index 72d3b950cf7..e9214ee1e44 100644
--- a/addons/account_coda/wizard/__init__.py
+++ b/addons/account_coda/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import coda_import
+import account_coda_import
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
new file mode 100644
index 00000000000..de817d1a40d
--- /dev/null
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -0,0 +1,292 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from mx import DateTime
+import base64
+
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+def str2date(date_str):
+    return time.strftime("%y/%m/%d", time.strptime(date_str, "%d%m%y"))
+
+def str2float(str):
+    try:
+        return float(str)
+    except:
+        return 0.0
+
+def list2float(lst):
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
+
+class account_coda_import(osv.osv_memory):
+    _name = 'account.coda.import'
+    _description = 'Account Coda Import'
+    _columns = {
+            'journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
+            'def_payable': fields.many2one('account.account', 'Default Payable Account', domain=[('type', '=', 'payable')], required=True, help= 'Set here the payable account that will be used, by default, if the partner is not found'),
+            'def_receivable': fields.many2one('account.account', 'Default Receivable Account', domain=[('type', '=', 'receivable')], required=True, help= 'Set here the receivable account that will be used, by default, if the partner is not found',),
+            'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', required=True, help= 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',),
+            'coda': fields.binary('Coda File', required=True),
+            'note':fields.text('Log'),
+    }
+    def coda_parsing(self, cr, uid, ids, context):
+
+        journal_obj=self.pool.get('account.journal')
+        account_period_obj = self.pool.get('account.period')
+        partner_bank_obj = self.pool.get('res.partner.bank')
+        bank_statement_obj = self.pool.get('account.bank.statement')
+        move_line_obj = self.pool.get('account.move.line')
+        bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+        statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+        account_coda_obj = self.pool.get('account.coda')
+        mod_obj = self.pool.get('ir.model.data')
+
+        data = self.read(cr, uid, ids)[0]
+
+
+        codafile = data['coda']
+        journal_code = journal_obj.browse(cr, uid, data['journal_id'], context).code
+
+        period = account_period_obj.find(cr, uid, context=context)[0]
+        def_pay_acc = data['def_payable']
+        def_rec_acc = data['def_receivable']
+
+        str_log = ""
+        err_log = "Errors:\n------\n"
+        nb_err=0
+        std_log=''
+        str_log1 = "Coda File is Imported  :  "
+        str_not=''
+        str_not1=''
+
+        bank_statements=[]
+        bank_statement = {}
+        recordlist = base64.decodestring(codafile).split('\n')
+        recordlist.pop()
+        for line in recordlist:
+            if line[0] == '0':
+                # header data
+
+                bank_statement["bank_statement_line"]={}
+                bank_statement_lines = {}
+                bank_statement['date'] = str2date(line[5:11])
+                bank_statement['journal_id']=data['journal_id']
+                period_id = account_period_obj.search(cr, uid, [('date_start', '<=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d"))), ('date_stop', '>=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d")))])
+                bank_statement['period_id'] = period_id and period_id[0] or False
+                bank_statement['state']='draft'
+            elif line[0] == '1':
+                # old balance data
+                bal_start = list2float(line[43:58])
+                if line[42] == '1':
+                    bal_start = - bal_start
+                bank_statement["balance_start"]= bal_start
+                bank_statement["acc_number"]=line[5:17]
+                bank_statement["acc_holder"]=line[64:90]
+                bank_statement['name'] = journal_code + ' ' + str(line[2:5])
+
+            elif line[0]=='2':
+                # movement data record 2
+                if line[1]=='1':
+                    # movement data record 2.1
+                    if bank_statement_lines.has_key(line[2:6]):
+                        continue
+                    st_line = {}
+                    st_line['extra_note'] = ''
+                    st_line['statement_id']=0
+                    st_line['ref'] = line[2:10]
+                    st_line['date'] = time.strftime('%Y-%m-%d', time.strptime(str2date(line[115:121]), "%y/%m/%d")),
+                    st_line_amt = list2float(line[32:47])
+
+                    if line[61]=='1':
+                        st_line['toreconcile'] = True
+                        st_line['name']=line[65:77]
+                    else:
+                        st_line['toreconcile'] = False
+                        st_line['name']=line[62:115]
+
+                    st_line['free_comm'] = st_line['name']
+                    st_line['val_date']=time.strftime('%Y-%m-%d', time.strptime(str2date(line[47:53]), "%y/%m/%d")),
+                    st_line['entry_date']=time.strftime('%Y-%m-%d', time.strptime(str2date(line[115:121]), "%y/%m/%d")),
+                    st_line['partner_id']=0
+                    if line[31] == '1':
+                        st_line_amt = - st_line_amt
+                        st_line['account_id'] = def_pay_acc
+                    else:
+                        st_line['account_id'] = def_rec_acc
+                    st_line['amount'] = st_line_amt
+                    bank_statement_lines[line[2:6]]=st_line
+                    bank_statement["bank_statement_line"]=bank_statement_lines
+                elif line[1] == '2':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+
+                elif line[1] == '3':
+                    # movement data record 3.1
+                    st_line_name = line[2:6]
+                    st_line_partner_acc = str(line[10:47]).strip()
+                    cntry_number=line[10:47].strip()
+                    contry_name=line[47:125].strip()
+                    bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', st_line_partner_acc)])
+                    bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
+                    if bank_ids:
+                        bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
+                        if line and bank.partner_id:
+                            bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
+                            if bank_statement_lines[st_line_name]['amount'] < 0 :
+                                bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
+                            else :
+                                bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
+                    else:
+                        nb_err += 1
+                        err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name)
+                        bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
+
+                    bank_statement["bank_statement_line"]=bank_statement_lines
+            elif line[0]=='3':
+                if line[1] == '1':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
+                elif line[1] == '2':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
+                elif line[1] == '3':
+                    st_line_name = line[2:6]
+                    bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
+            elif line[0]=='8':
+                # new balance record
+                bal_end = list2float(line[42:57])
+                if line[41] == '1':
+                    bal_end = - bal_end
+                bank_statement["balance_end_real"]= bal_end
+
+            elif line[0]=='9':
+                # footer record
+
+                bank_statements.append(bank_statement)
+        #end for
+        bkst_list=[]
+        for statement in bank_statements:
+            try:
+                bk_st_id =bank_statement_obj.create(cr, uid, {
+                    'journal_id': statement['journal_id'],
+                    'date':time.strftime('%Y-%m-%d', time.strptime(statement['date'], "%y/%m/%d")),
+                    'period_id':statement['period_id'] or period,
+                    'balance_start': statement["balance_start"],
+                    'balance_end_real': statement["balance_end_real"],
+                    'state': 'draft',
+                    'name': statement['name'],
+                })
+                lines=statement["bank_statement_line"]
+                for value in lines:
+                    line=lines[value]
+                    reconcile_id = False
+                    if line['toreconcile']:
+                        rec_id = move_line_obj.search(cr, uid, [('name', '=', line['name']), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
+                        if rec_id:
+                            reconcile_id = statement_reconcile_obj.create(cr, uid, {
+                                'line_ids': [(6, 0, rec_id)]
+                                }, context=context)
+                    str_not1 = ''
+                    if line.has_key('contry_name') and line.has_key('cntry_number'):
+                        str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"], line["cntry_number"], line["free_comm"]+line['extra_note'], line["val_date"][0], line["entry_date"][0])
+                    id=bank_statement_line_obj.create(cr, uid, {
+                               'name':line['name'],
+                               'date': line['date'],
+                               'amount': line['amount'],
+                               'partner_id':line['partner_id'] or 0,
+                               'account_id':line['account_id'],
+                               'statement_id': bk_st_id,
+                               'reconcile_id': reconcile_id,
+                               'note':str_not1,
+                               'ref':line['ref'],
+                               })
+
+                str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"], statement["acc_holder"])
+                std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
+                          %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
+                bkst_list.append(bk_st_id)
+
+            except osv.except_osv, e:
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n Application Error : ' + str(e)
+                raise # REMOVEME
+
+            except Exception, e:
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n System Error : '+str(e)
+                raise # REMOVEME
+            except :
+                cr.rollback()
+                nb_err+=1
+                err_log += '\n Unknown Error'
+                raise
+        err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
+        err_log += '\nNumber of error :'+ str(nb_err) +'\n'
+
+        account_coda_obj.create(cr, uid, {
+            'name':codafile,
+            'statement_ids': [(6, 0, bkst_list,)],
+            'note':str_log1+str_not+std_log+err_log,
+            'journal_id':data['journal_id'],
+            'date':time.strftime("%Y-%m-%d"),
+            'user_id':uid,
+            })
+        test=''
+        test=str_log1 + std_log + err_log
+        self.write(cr, uid, ids, {'note':test}, context=context)
+        extraction= { 'statment_ids':bkst_list}
+        context.update({ 'statment_ids':bkst_list})
+        model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_note_view')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+                'name': _('Result'),
+                'res_id': ids[0],
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.coda.import',
+                'view_id': False,
+                'target':'new',
+                'views': [(resource_id, 'form')],
+                'context': context,
+                'type': 'ir.actions.act_window',
+        }
+    def action_open_window(self, cr, uid, data, context):
+        return {
+            'domain':"[('id','in',%s)]"%(context.get('statment_ids', False)),
+            'name': 'Statement',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.bank.statement',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+        }
+account_coda_import()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
new file mode 100644
index 00000000000..f344221c411
--- /dev/null
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+        <record id="account_coda_import_view" model="ir.ui.view">
+             <field name="name">Import Coda Statement</field>
+             <field name="model">account.coda.import</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+				<form string="Import Coda Statement">
+				<separator colspan="4" string="Configure Your Journal and Account :" />
+				    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
+				    <newline />
+				    <field name="def_payable" />
+				    <newline />
+				    <field name="def_receivable" />
+				    <newline />
+				    <field name="awaiting_account" />
+				    <separator string="Click on 'New' to select your file :" colspan="4"/>
+				    <field name="coda"/>
+				    <newline/>
+					<group colspan="4" col="6">
+                       	<separator colspan="6"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               			<button name="coda_parsing" string="Import" type="object" icon="gtk-ok"/>
+ 					</group>				    
+				</form>
+			</field>
+		</record>
+		
+		<record id="account_coda_note_view" model="ir.ui.view">
+	         <field name="name">Import Coda Statement</field>
+	         <field name="model">account.coda.import</field>
+	         <field name="type">form</field>
+	         <field name="arch" type="xml">
+				<form string="Result of Imported Coda Statements">
+					<group width="500" height="420">
+						<separator colspan="4" string="Results :" />
+				    	<field name="note" colspan="4" nolabel="1" width="500"/>
+				    	<newline/>
+						<separator colspan="6"/>
+						<button special="cancel" string="Close" icon="gtk-cancel"/>
+						<button name="action_open_window" string="Open Statements" type="object" icon="gtk-apply"/>
+					</group>		    	
+		    	</form>
+	    	</field>
+	   	</record>
+	   	
+	   	<record id="action_account_coda_import" model="ir.actions.act_window">
+            <field name="name">Import Coda Statement</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.coda.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+   			<field name="view_id" ref="account_coda_import_view"/>            
+        </record>
+
+</data>
+</openerp>
diff --git a/addons/account_coda/wizard/coda_import.py b/addons/account_coda/wizard/coda_import.py
deleted file mode 100644
index 82fc7bf877c..00000000000
--- a/addons/account_coda/wizard/coda_import.py
+++ /dev/null
@@ -1,341 +0,0 @@
-# -*- encoding: 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/>.
-#
-##############################################################################
-
-import pooler
-import time
-import datetime
-import wizard
-import netsvc
-import base64
-from osv import osv
-from tools.translate import _
-
-codawiz_form = """<?xml version="1.0"?>
-<form string="Import Coda Statement">
-<separator colspan="4" string="Select your bank journal :" />
-    <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
-    <newline />
-    <field name="def_payable" />
-    <newline />
-    <field name="def_receivable" />
-    <newline />
-    <field name="awaiting_account" />
-    <separator string="Click on 'New' to select your file :" colspan="4"/>
-    <field name="coda"/>
-</form>
-"""
-
-codawiz_fields = {
-    'journal_id' : {
-        'string':'Bank Journal',
-        'type':'many2one',
-        'relation':'account.journal',
-        'required':True,
-
-    },
-    'coda' : {
-        'string':'Coda File',
-        'type':'binary',
-        'required':True,
-    },
-    'def_payable' : {
-        'string' : 'Default Payable Account',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'domain':[('type','=','payable')],
-        'help': 'Set here the payable account that will be used, by default, if the partner is not found',
-    },
-    'def_receivable' : {
-        'string' : 'Default receivable Account',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'domain':[('type','=','receivable')],
-        'help': 'Set here the receivable account that will be used, by default, if the partner is not found',
-    },
-    'awaiting_account' : {
-        'string' : 'Default Account for Unrecognized Movement',
-        'type' : 'many2one',
-        'relation': 'account.account',
-        'required':True,
-        'help': 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',
-
-    }
-
-}
-
-result_form = """<?xml version="1.0"?>
-<form string="Import Coda Statement">
-<separator colspan="4" string="Results :" />
-    <field name="note" colspan="4" nolabel="1" width="500"/>
-</form>
-"""
-
-result_fields = {
-
-    'note' : {'string':'Log','type':'text'}
-
-}
-
-
-def _coda_parsing(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    codafile = data['form']['coda']
-    journal_code = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context).code
-    def_pay_acc = data['form']['def_payable']
-    def_rec_acc = data['form']['def_receivable']
-
-    str_log = ""
-    err_log = "Errors:\n------\n"
-    nb_err=0
-    std_log=''
-    str_log1 = "Coda File is Imported  :  "
-    str_not=''
-    str_not1=''
-
-    bank_statements=[]
-    recordlist = base64.decodestring(codafile).split('\n')
-    recordlist.pop()
-    for line in recordlist:
-        if line[0] == '0':
-            # header data
-            bank_statement = {}
-            bank_statement["bank_statement_line"]={}
-            bank_statement_lines = {}
-            bank_statement['date'] = str2date(line[5:11])
-            bank_statement['journal_id']=data['form']['journal_id']
-            period_id = pool.get('account.period').search(cr, uid, [('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
-            bank_statement['period_id'] = period_id[0]
-            bank_statement['state']='draft'
-        elif line[0] == '1':
-            # old balance data
-            bal_start = list2float(line[43:58])
-            if line[42] == '1':
-                bal_start = - bal_start
-            bank_statement["balance_start"]= bal_start
-            bank_statement["acc_number"]=line[5:17]
-            bank_statement["acc_holder"]=line[64:90]
-            bank_statement['name'] = journal_code + ' ' + str(line[2:5])
-
-        elif line[0]=='2':
-            # movement data record 2
-            if line[1]=='1':
-                # movement data record 2.1
-                if bank_statement_lines.has_key(line[2:6]):
-                    continue
-                st_line = {}
-                st_line['extra_note'] = ''
-                st_line['statement_id']=0
-                st_line['ref'] = line[2:10]
-                st_line['date'] = time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
-                st_line_amt = list2float(line[32:47])
-
-                if line[61]=='1':
-                    st_line['toreconcile'] = True
-                    st_line['name']=line[65:77]
-                else:
-                    st_line['toreconcile'] = False
-                    st_line['name']=line[62:115]
-
-                st_line['free_comm'] = st_line['name']
-                st_line['val_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[47:53]),"%y/%m/%d")),
-                st_line['entry_date']=time.strftime('%Y-%m-%d',time.strptime(str2date(line[115:121]),"%y/%m/%d")),
-                st_line['partner_id']=0
-                if line[31] == '1':
-                    st_line_amt = - st_line_amt
-                    st_line['account_id'] = def_pay_acc
-                else:
-                    st_line['account_id'] = def_rec_acc
-                st_line['amount'] = st_line_amt
-                bank_statement_lines[line[2:6]]=st_line
-                bank_statement["bank_statement_line"]=bank_statement_lines
-            elif line[1] == '2':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
-
-            elif line[1] == '3':
-                # movement data record 3.1
-                st_line_name = line[2:6]
-                st_line_partner_acc = str(line[10:47]).strip()
-                cntry_number=line[10:47].strip()
-                contry_name=line[47:125].strip()
-                bank_ids = pool.get('res.partner.bank').search(cr, uid, [('acc_number','=',st_line_partner_acc)])
-                bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
-                if bank_ids:
-                    bank = pool.get('res.partner.bank').browse(cr, uid, bank_ids[0], context)
-                    if line and bank.partner_id:
-                        bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
-                        if bank_statement_lines[st_line_name]['amount'] < 0 :
-                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
-                        else :
-                            bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
-                else:
-                    nb_err += 1
-                    err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number,contry_name)
-                    bank_statement_lines[st_line_name].update({'account_id': data['form']['awaiting_account']})
-
-                bank_statement["bank_statement_line"]=bank_statement_lines
-        elif line[0]=='3':
-            if line[1] == '1':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[40:113]
-            elif line[1] == '2':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:115]
-            elif line[1] == '3':
-                st_line_name = line[2:6]
-                bank_statement_lines[st_line_name]['extra_note'] += '\n' + line[10:100]
-        elif line[0]=='8':
-            # new balance record
-            bal_end = list2float(line[42:57])
-            if line[41] == '1':
-                bal_end = - bal_end
-            bank_statement["balance_end_real"]= bal_end
-
-        elif line[0]=='9':
-            # footer record
-            bank_statements.append(bank_statement)
-    #end for
-    bkst_list=[]
-    for statement in bank_statements:
-        try:
-            bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
-                'journal_id': statement['journal_id'],
-                'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
-                'period_id':statement['period_id'],
-                'balance_start': statement["balance_start"],
-                'balance_end_real': statement["balance_end_real"],
-                'state': 'draft',
-                'name': statement['name'],
-            })
-            lines=statement["bank_statement_line"]
-            for value in lines:
-                line=lines[value]
-                reconcile_id = False
-                if line['toreconcile']:
-                    rec_id = pool.get('account.move.line').search(cr, uid, [('name','=',line['name']),('reconcile_id','=',False),('account_id.reconcile','=',True)])
-                    if rec_id:
-                        reconcile_id = pool.get('account.bank.statement.reconcile').create(cr, uid, {
-                            'line_ids': [(6, 0, rec_id)]
-                            }, context=context)
-                str_not1 = ''
-                if line.has_key('contry_name') and line.has_key('cntry_number'):
-                    str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"],line["cntry_number"],line["free_comm"]+line['extra_note'],line["val_date"][0],line["entry_date"][0])
-                id=pool.get('account.bank.statement.line').create(cr,uid,{
-                           'name':line['name'],
-                           'date': line['date'],
-                           'amount': line['amount'],
-                           'partner_id':line['partner_id'] or 0,
-                           'account_id':line['account_id'],
-                           'statement_id': bk_st_id,
-                           'reconcile_id': reconcile_id,
-                           'note':str_not1,
-                           'ref':line['ref'],
-                           })
-
-            str_not= "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"],statement["acc_holder"])
-            std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
-                      %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
-            bkst_list.append(bk_st_id)
-
-        except osv.except_osv, e:
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n Application Error : ' + str(e)
-            raise # REMOVEME
-
-        except Exception, e:
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n System Error : '+str(e)
-            raise # REMOVEME
-        except :
-            cr.rollback()
-            nb_err+=1
-            err_log += '\n Unknown Error'
-            raise
-    err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
-    err_log += '\nNumber of error :'+ str(nb_err) +'\n'
-
-    pool.get('account.coda').create(cr, uid, {
-        'name':codafile,
-        'statement_ids': [(6, 0, bkst_list,)],
-        'note':str_log1+str_not+std_log+err_log,
-        'journal_id':data['form']['journal_id'],
-        'date':time.strftime("%Y-%m-%d"),
-        'user_id':uid,
-        })
-
-    return {'note':str_log1 + std_log + err_log ,'journal_id': data['form']['journal_id'], 'coda': data['form']['coda'],'statment_ids':bkst_list}
-
-
-def str2date(date_str):
-    return time.strftime("%y/%m/%d",time.strptime(date_str,"%d%m%y"))
-
-def str2float(str):
-    try:
-        return float(str)
-    except:
-        return 0.0
-
-def list2float(lst):
-    try:
-        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
-    except:
-        return 0.0
-
-class coda_import(wizard.interface):
-    def _action_open_window(self, cr, uid, data, context):
-        form=data['form']
-        return {
-            'domain':"[('id','in',%s)]"%(form['statment_ids']),
-            'name': 'Statement',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.bank.statement',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-        }
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : codawiz_form,
-                    'fields' : codawiz_fields,
-                    'state' : [('end', '_Close'),('extraction', '_Ok') ]}
-        },
-        'extraction' : {
-            'actions' : [_coda_parsing],
-            'result' : {'type' : 'form',
-                    'arch' : result_form,
-                    'fields' : result_fields,
-                    'state' : [('end', '_Close'),('open', '_Open Statement')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state': 'end'}
-
-            },
-
-    }
-coda_import("account.coda_import")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index 3065bef0130..b0067573a2f 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import followup
-import followup_report
+import account_followup
+import account_followup_report
 import wizard
 import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index df3955d8180..5aefa0abc96 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Accounting follow-ups management',
     'version': '1.0',
@@ -28,19 +27,18 @@
     Modules to automate letters for unpaid invoices, with multi-level recalls.
 
     You can define your multiple levels of recall through the menu:
-        Financial Management/Configuration/Payment Terms/Follow-Ups
+        Financial Management/Configuration/Follow-Ups
 
     Once it's defined, you can automatically print recalls every day
     through simply clicking on the menu:
-        Financial_Management/Periodical_Processing/Print_Follow-Ups
+        Financial Management/Periodical Processing/Send followups
 
     It will generate a PDF with all the letters according the the
     different levels of recall defined. You can define different policies
-    for different companies.
-
+    for different companies. You can send also mail to the customer.
 
     Note that if you want to change the followup level for a given partner/account entry, you can do it in the menu:
-        Financial_Management/Reporting/Follow-Ups/All Receivable Entries
+        Accounting/Reporting/Follow-Ups/All receivable entries
 
 """,
     'author': 'Tiny',
@@ -50,13 +48,14 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
-        'followup_report_view.xml',
-        'followup_view.xml',
-        'followup_data.xml'
+        'account_followup_report.xml',
+        'account_followup_view.xml',
+        'account_followup_data.xml'
     ],
-    'demo_xml': ['followup_demo.xml'],
+    'demo_xml': ['account_followup_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0072481076453',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/followup.py b/addons/account_followup/account_followup.py
similarity index 89%
rename from addons/account_followup/followup.py
rename to addons/account_followup/account_followup.py
index c8bf9537f13..02986acb184 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/account_followup.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/>.
 #
 ##############################################################################
 
@@ -23,13 +23,17 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Follow-Up'
+    _description = 'Account Follow Up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
         'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-Up'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+    _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
+                }
+
 followup()
 
 class followup_line(osv.osv):
@@ -42,26 +46,27 @@ class followup_line(osv.osv):
         'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True),
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),
         'description': fields.text('Printed Message', translate=True),
-    }
+                }
+
 followup_line()
 
 class account_move_line(osv.osv):
-    _name = 'account.move.line'
     _inherit = 'account.move.line'
     _columns = {
         'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'),
         'followup_date': fields.date('Latest Follow-up'),
-    }
+                }
+
 account_move_line()
 
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'follow_up_msg' : fields.text('Follow-up Message', translate=True),
-    }
+                }
 
     _defaults = {
-        'overdue_msg': lambda *a: '''
+        'overdue_msg': '''
 Date : %(date)s
 
 Dear %(partner_name)s,
@@ -75,8 +80,8 @@ Thanks,
 %(user_signature)s
 %(company_name)s
         '''
-    }
+                }
+
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/followup_data.xml b/addons/account_followup/account_followup_data.xml
similarity index 100%
rename from addons/account_followup/followup_data.xml
rename to addons/account_followup/account_followup_data.xml
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/account_followup_demo.xml
similarity index 100%
rename from addons/account_followup/followup_demo.xml
rename to addons/account_followup/account_followup_demo.xml
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/account_followup_report.py
similarity index 100%
rename from addons/account_followup/followup_report.py
rename to addons/account_followup/account_followup_report.py
diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/account_followup_report.xml
similarity index 100%
rename from addons/account_followup/followup_report_view.xml
rename to addons/account_followup/account_followup_report.xml
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/account_followup_view.xml
similarity index 85%
rename from addons/account_followup/followup_view.xml
rename to addons/account_followup/account_followup_view.xml
index ae31f7253a2..50c1cb5df34 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="view_account_followup_followup_line_tree" model="ir.ui.view">
             <field name="name">account_followup.followup.line.tree</field>
             <field name="model">account_followup.followup.line</field>
@@ -15,40 +15,39 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_followup_followup_line_form" model="ir.ui.view">
             <field name="name">account_followup.followup.line.form</field>
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
-                    <field name="sequence" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="delay" select="1"/>
-                    <field name="start" select="1"/>
+                    <field name="sequence"/>
+                    <field name="name" />
+                    <field name="delay" />
+                    <field name="start" />
                     <newline/>
-                    <field colspan="4" name="description" select="1"/>
+                    <field colspan="4" name="description" />
                     <separator string="Legend" colspan="4"/>
-
-                    <label string="%%(partner_name)s: Partner name" colspan="2"/>
+                    <label string="%%(partner_name)s: Partner Name" colspan="2"/>
                     <label string="%%(date)s: Current Date" colspan="2"/>
-                    <label string="%%(user_signature)s: User name" colspan="2"/>
-                    <label string="%%(company_name)s: User's Company name" colspan="2"/>
+                    <label string="%%(user_signature)s: User Name" colspan="2"/>
+                    <label string="%%(company_name)s: User's Company Name" colspan="2"/>
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_followup_followup_form" model="ir.ui.view">
             <field name="name">account_followup.followup.form</field>
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <field name="name" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1" select="1"/>
-                    <separator colspan="4" string="Lines"/>
+                    <field colspan="4" name="description" nolabel="1" />
+                    <separator colspan="4" string="Followup Lines"/>
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -66,17 +65,30 @@
             </field>
         </record>
 
+        <record id="view_account_followup_filter" model="ir.ui.view">
+            <field name="name">account.followup.select</field>
+            <field name="model">account_followup.followup</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Followup">
+                   <group col="10" colspan="4">
+                        <field name="name"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_account_followup_definition_form" model="ir.actions.act_window">
             <field name="name">Follow-Ups</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account_followup.followup</field>
+            <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
         </record>
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration"/>
-        
+
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
-        
-        
+
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
             <field name="model">account.move.line</field>
@@ -99,7 +111,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.followup</field>
             <field name="model">account.move.line</field>
@@ -111,7 +123,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree.followup</field>
             <field name="model">account.move.line</field>
@@ -123,17 +135,17 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
-        
+
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
-        
+
         <menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.menu_action_followup_stat"/>
-        
+
         <act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="All payable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
-        
+
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
-        
+
         <record model="ir.ui.view" id="view_company_inherit_followup_form">
             <field name="name">res.company.followup.form.inherit</field>
             <field name="inherit_id" ref="account.view_company_inherit_form"/>
@@ -146,5 +158,6 @@
                 </field>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index 4f1df09c302..08c572a5ba9 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -30,12 +30,12 @@ class report_rappel(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_rappel, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
-            'time' : time,
+            'time': time,
             'ids_to_objects': self._ids_to_objects,
-            'adr_get' : self._adr_get,
-            'getLines' : self._lines_get,
-            'get_text' : self._get_text
-        })
+            'adr_get': self._adr_get,
+            'getLines': self._lines_get,
+            'get_text': self._get_text
+                                })
 
     def _ids_to_objects(self, partners_ids):
         pool = pooler.get_pool(self.cr.dbname)
@@ -91,10 +91,8 @@ class report_rappel(report_sxw.rml_parse):
 
         return text
 
-
 report_sxw.report_sxw('report.account_followup.followup.print',
         'res.partner', 'addons/account_followup/report/rappel.rml',
         parser=report_rappel)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 89353993a85..868249365ee 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -34,25 +34,32 @@ class account_followup_print(osv.osv_memory):
                 }
 
     def _get_followup(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if context.get('active_model', 'ir.ui.menu') == 'account_followup.followup':
+            return context.get('active_id', False)
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        tmp = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)])
-        return tmp and tmp[0] or False
+        followp_id = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)], context=context)
+        return followp_id and followp_id[0] or False
 
     def do_continue(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         context.update({'followup_id': data['followup_id'], 'date':data['date']})
         return {
-                'name': _('Select partners'),
-                'view_type': 'form',
-                'context': context,
-                'view_mode': 'tree,form',
-                'res_model': 'account.followup.print.all',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
+            'name': _('Select Partners'),
+            'view_type': 'form',
+            'context': context,
+            'view_mode': 'tree,form',
+            'res_model': 'account.followup.print.all',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
             }
 
     _defaults = {
@@ -74,10 +81,12 @@ class account_followup_print_all(osv.osv_memory):
         'summary': fields.text('Summary', required=True, readonly=True)
                 }
     def _get_summary(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('summary', '')
 
     def _get_partners(self, cr, uid, context=None):
-        return self._get_partners_followp(cr, uid, [], context)['partner_ids']
+        return self._get_partners_followp(cr, uid, [], context=context)['partner_ids']
 
     def _get_msg(self, cr, uid, context=None):
         return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
@@ -168,17 +177,19 @@ class account_followup_print_all(osv.osv_memory):
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')
         line_obj = self.pool.get('account_followup.stat')
+
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-
         if data['email_conf']:
             mail_notsent = ''
             msg_sent = ''
             msg_unsent = ''
             count = 0
             data_user = user_obj.browse(cr, uid, uid)
-            move_lines = line_obj.browse(cr, uid, data['partner_ids'][0][2])
+            move_lines = line_obj.browse(cr, uid, data['partner_ids'])
             partners = []
             dict_lines = {}
             for line in move_lines:
@@ -253,8 +264,9 @@ class account_followup_print_all(osv.osv_memory):
             context.update({'summary': summary})
         else:
             context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
+
         return {
-            'name': _('Summary'),
+            'name': _('Follwoup Summary'),
             'view_type': 'form',
             'context': context,
             'view_mode': 'tree,form',
@@ -266,6 +278,8 @@ class account_followup_print_all(osv.osv_memory):
                     }
 
     def do_print(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [])[0]
         res = self._get_partners_followp(cr, uid, ids, context)['to_update']
         to_update = res
@@ -285,6 +299,7 @@ class account_followup_print_all(osv.osv_memory):
              'model': 'account_followup.followup',
              'form': data
                  }
+
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account_followup.followup.print',
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 9e0c34c8bf5..a97e54347cb 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data noupdate="0">
 
-        <!--<wizard string="Send followups"
-                name="account_followup.followup.print.all"
-                id="action_account_followup_all_wizard"
-                model="account_followup.followup" />
-
-        <menuitem action="action_account_followup_all_wizard"
-                  id="account_followup_wizard_menu"
-                  parent="account.menu_finance_periodical_processing"
-                  type="wizard" />-->
-
-
         <record id="view_account_followup_print" model="ir.ui.view">
             <field name="name">account.followup.print.form</field>
             <field name="model">account.followup.print</field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index d238fe952fc..29798d34b91 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -45,11 +45,11 @@
             <field name="model">payment.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Type">
-                    <field name="name" select="1"/>
+				<form string="Payment Type">
+                    <field name="name"/>
                     <field name="code"/>
-                    <newline/>
-                    <field colspan="4" name="suitable_bank_types" select="1"/>
+                    <separator string="Suitable Bank Types" colspan="4"/>
+                    <field name="suitable_bank_types" nolabel="1"  colspan="4"/>
                 </form>
             </field>
         </record>
@@ -299,8 +299,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <group colspan="2" col="3" position="inside">
-                    <button name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
+                <group col="6" colspan="4" position="inside">
+                    <button  colspan="2" name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
                 </group>
             </field>
         </record>
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index ef94c9161f9..4245bf40415 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -113,7 +113,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
         else:
             temp_head = [str(x[0:3]) for x in self.header_name]
             head_dict = dict(zip(temp_head,temp_head))
-        print "head_dict",head_dict
         return [head_dict]
 
     def getarray(self,data,object,array_header=''):
diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
index f7277115529..929024fd54a 100644
--- a/addons/account_report/report/print_indicator.rml
+++ b/addons/account_report/report/print_indicator.rml
@@ -102,8 +102,8 @@
 	</blockTable>
 	<para style="P3"><font color="white"> </font></para>
 	<para style="P3"><seqReset/></para>
+	<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
 	<section>
-		<para style="P1">[[ repeatIn(lines(data['form']),'o')]]</para>
 		<blockTable colWidths="528.0" style="Table7">
 		<tr>
 			<td><para style="P11"><font color="white">[['.....'*(o['level']) ]]</font><font>[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]]</font>(<seq/>)<font>[[ o['name'] ]]  ([[ o['code'] ]])</font></para></td>
diff --git a/addons/account_report/wizard/account_report_print_indicators_view.xml b/addons/account_report/wizard/account_report_print_indicators_view.xml
index 9add8c9a616..e5a0ec30c76 100644
--- a/addons/account_report/wizard/account_report_print_indicators_view.xml
+++ b/addons/account_report/wizard/account_report_print_indicators_view.xml
@@ -8,14 +8,14 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Indicators">
-	             	<label string="Select the criteria based on which Indicators will be printed."/>
-	             	<newline/>
+	               <group width="450">
+	             	<separator string="Select the criteria based on which Indicators will be printed." colspan="4"/>
 				    <field name="select_base"/>
-				    <separator string="" colspan="4"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
+				    <separator colspan="4"/>
+					    <group colspan="4" col="6">
+	     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               			<button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
+	 					</group>
  					</group>
 				</form>
 			</field>
@@ -31,9 +31,11 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem action="action_account_report_print_indicators"
-				name="Print Indicators"
-				parent="account_report.menu_action_account_report_tree_view" id="menu_wizard_print_indicators"/>
+		<menuitem
+			action="action_account_report_print_indicators"
+			name="Print Indicators"
+			parent="account_report.menu_action_account_report_tree_view"
+			id="menu_wizard_print_indicators"/>
 
 		<record id="account_report_print_indicators_relation_view" model="ir.ui.view">
              <field name="name">account.report.print.indicators.relation.form</field>
@@ -41,10 +43,10 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Indicators">
-	             	<newline/>
 				    <separator string="" colspan="4"/>
+				    <newline/>
 				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+				        <newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
  					</group>
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
index b554152c19d..07db4156af9 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
+++ b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
@@ -8,13 +8,16 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 	             <form string="Select Dates Period">
-                 	<field name="fiscalyear"/>
-					<newline/>
-					<field name="periods"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+	             	<group height="350" width="390">
+	                 	<field name="fiscalyear" colspan="4"/>
+	                 	<newline/>
+	                 	<separator string="Periods" colspan="4"/>
+						<field name="periods" nolabel="1" colspan="4"/>
+	                    <separator colspan="4"/>
+					    <group colspan="4" col="6">
+	     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+	 					</group>
  					</group>
 				</form>
 			</field>
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 3dff856b716..408df2ee031 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,16 +23,11 @@
     "name" : "Accounting Voucher Entries",
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
-    "description": """
-    Indian Accounting module includes all the basic requirenments of
-    Basic Accounting, plus new things which are available :
-    * Indian Account Chart
-    * New Invoice - (Local, Retail)
-    * Invoice Report
-    * Tax structure
-    * Journals
-    * VAT Declaration report
-    * Accounting Periods
+    "description": """Account Voucher module includes all the basic requirements of
+    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
+    * Voucher Entry
+    * Voucher Receipt
+    * Cheque Register
     """,
     "category" : "Generic Modules/Accounting",
     "website" : "http://tinyerp.com",
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 397104d8f9e..f51e5ef5696 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index dc29ee9f404..721c87fbcf5 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.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/>.
 #
 ##############################################################################
 
@@ -41,7 +41,6 @@ class rml_parse(report_sxw.rml_parse):
         })
 
     def comma_me(self,amount):
-        #print "#" + str(amount) + "#"
         if not amount:
             amount = 0.0
         if  type(amount) is float :
@@ -56,14 +55,14 @@ class rml_parse(report_sxw.rml_parse):
             return new
         else:
             return self.comma_me(new)
-        
+
     def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
         ellipsis = ellipsis or ''
         try:
             return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
         except Exception, e:
             return False
-        
+
     def _strip_name(self, name, maxlen=50):
         return self._ellipsis(name, maxlen, '...')
 
@@ -100,14 +99,13 @@ class rml_parse(report_sxw.rml_parse):
             try:
                 Stringer = str.encode("utf-16")
             except UnicodeDecodeError:
-                print "UTF_16 Error"
                 Stringer = str
             else:
                 return Stringer
         else:
             return Stringer
         return Stringer
-    
+
     def explode_this(self,chaine,length):
         #chaine = self.repair_string(chaine)
         chaine = rstrip(chaine)
@@ -118,20 +116,18 @@ class rml_parse(report_sxw.rml_parse):
             i = i + length
         chaine = str("".join(ast))
         return chaine
-    
+
     def repair_string(self,chaine):
         ast = list(chaine)
         UnicodeAst = []
         _previouslyfound = False
         i = 0
-        #print str(ast)
         while i < len(ast):
             elem = ast[i]
             try:
                 Stringer = elem.encode("utf-8")
             except UnicodeDecodeError:
                 to_reencode = elem + ast[i+1]
-                print str(to_reencode)
                 Good_char = to_reencode.decode('utf-8')
                 UnicodeAst.append(Good_char)
                 i += i +2
@@ -141,17 +137,13 @@ class rml_parse(report_sxw.rml_parse):
         return "".join(UnicodeAst)
 
     def ReencodeAscii(self,str):
-        print sys.stdin.encoding
         try:
             Stringer = str.decode("ascii")
         except UnicodeEncodeError:
-            print "REENCODING ERROR"
             return str.encode("ascii")
         except UnicodeDecodeError:
-            print "DECODING ERROR"
             return str.encode("ascii")
         else:
-            print Stringer
             return Stringer
 
     def _add_header(self, node, header=1):
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index b4203be5416..1291eeb4092 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,0,0,0
 "access_account_voucher_line_user","account.voucher.line","model_account_voucher_line","account.group_account_user",1,0,0,0
+"access_account_open_voucher_user","account.open.voucher","model_account_open_voucher","account.group_account_user",1,0,0,0
 "access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,1,1,1
 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,1,1,1
-
+"access_account_open_voucher_manager","account.open.voucher","model_account_open_voucher","account.group_account_manager",1,1,1,1
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 69a5aba09e0..90dbcca468f 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -51,7 +51,7 @@ ir_sequence_type()
 class account_journal(osv.osv):
     _inherit = "account.journal"
     _columns = {
-        'max_amount': fields.float('Verify Transection', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
+        'max_amount': fields.float('Verify Transaction', digits=(16, 2), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
     }
 account_journal()
 
@@ -60,7 +60,7 @@ class account_voucher(osv.osv):
     def _get_period(self, cr, uid, context={}):
         if context.get('period_id', False):
             return context.get('period_id')
-            
+
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -76,12 +76,12 @@ class account_voucher(osv.osv):
 
     def _get_journal(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
-        
+
         if context.get('journal_id', False):
             return context.get('journal_id')
-        
+
         type_inv = context.get('type', 'rec_voucher')
-        
+
         ttype = type2journal.get(type_inv, type_inv)
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
 
@@ -116,7 +116,7 @@ class account_voucher(osv.osv):
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
         'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
-        'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
+        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}, required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -131,7 +131,7 @@ class account_voucher(osv.osv):
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
-                        \n* The \'Cancelled\' state is used when user cancel voucher.'),                    
+                        \n* The \'Cancelled\' state is used when user cancel voucher.'),
         'amount':fields.float('Amount', readonly=True),
         'number':fields.char('Number', size=32, readonly=True),
         'reference': fields.char('Voucher Reference', size=64),
@@ -147,7 +147,7 @@ class account_voucher(osv.osv):
         'type': _get_type,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
-        
+
         'state': lambda *a: 'draft',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'reference_type': lambda *a: "none",
@@ -159,7 +159,7 @@ class account_voucher(osv.osv):
 #        cur_obj = self.pool.get('res.currency')
 
     def onchange_account(self, cr, uid, ids, account_id):
-        
+
         if not account_id:
             return {
                 'value':{'amount':False}
@@ -176,9 +176,9 @@ class account_voucher(osv.osv):
             return {
                 'value':{'account_id':False}
             }
-            
+
         journal = self.pool.get('account.journal')
-        
+
         if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')):
             account_id = journal.browse(cr, uid, journal_id).default_debit_account_id
             return {
@@ -221,7 +221,7 @@ class account_voucher(osv.osv):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 
-    def unlink(self, cr, uid, ids, context={}):
+    def unlink(self, cr, uid, ids, context=None):
         vouchers = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
         for t in vouchers:
@@ -229,7 +229,7 @@ class account_voucher(osv.osv):
                 unlink_ids.append(t['id'])
             else:
                 raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
-        return super(account_voucher, self).unlink(self, cr, uid, unlink_ids)
+        return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context)
 
     def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
@@ -262,12 +262,12 @@ class account_voucher(osv.osv):
         return iml
 
     def action_move_line_create(self, cr, uid, ids, *args):
-    
+
         for inv in self.browse(cr, uid, ids):
-        
+
             if inv.move_id:
                 continue
-                
+
             company_currency = inv.company_id.currency_id.id
 
             line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
@@ -386,7 +386,7 @@ class account_voucher(osv.osv):
                 elif line.type == 'cr':
                     move_line['credit'] = line.amount or False
                     amount=line.amount * (-1)
-                
+
                 move_line['analytic_account_id'] = line.account_analytic_id.id or False
                 ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
 
@@ -433,7 +433,7 @@ class account_voucher(osv.osv):
             'tax_amount': x.get('tax_amount', False),
             'ref':x.get('ref',False)
         }
-        
+
     def _convert_ref(self, cr, uid, ref):
         return (ref or '').replace('/','')
 
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 3f4ebd1b160..91038bba0bb 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -49,12 +49,17 @@
                             <separator string="Narration" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
                             <group col="6" colspan="6">
-                                <field name="state"/>
-                                <button name="open_voucher" string="Pro-forma" states="draft"/>
-                                <button name="proforma_voucher" string="Create" states="proforma"/>
-                                <button name="recheck_voucher" string="Validate" states="recheck"/>
-                                <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  type="object"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                <group col="2" colspan="2">
+                                    <field name="state"/>
+                                </group>
+                                <group col="8" colspan="4">
+                                    <button name="open_voucher" string="Pro-forma" states="draft" icon="terp-check"/>
+                                    <button name="proforma_voucher" string="Create" states="proforma" icon="terp-document-new"/>
+                                    <button name="recheck_voucher" string="Validate" states="recheck" icon="terp-check"/>
+                                    <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>
+                                    <button name="cancel_voucher" string="Cancel" states="proforma,recheck,posted"  icon="gtk-cancel"/>
+                                    <button name="cancel_to_draft" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -62,8 +67,6 @@
                             <field name="currency_id" select="1" />
                             <field name="period_id"/>
                             <field name="date" select="1"/>
-                            <!--field name="reference_type" nolabel="1" size="0"/>
-                            <field name="reference" select="1" nolabel="1"/-->
                             <separator string="General Entries" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
@@ -72,7 +75,7 @@
             </field>
         </record>
 
-        <record id="view_account_move_filter" model="ir.ui.view">
+        <record id="view_voucher_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
             <field name="type">search</field>
@@ -98,13 +101,40 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options...">
-                       <field name="journal_id" widget="selection" context="{'journal_id': self}" />
+                       <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
                        <field name="type" context="{'type': self}" />
                    </group>
                 </search>
             </field>
         </record>
+        <record id="view_voucher_filter_new" model="ir.ui.view">
+            <field name="name">account.voucher.select</field>
+            <field name="model">account.voucher</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Vouchers">
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="number" select='1'/>
+                        <field name="partner_id" select='1'/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
          <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
@@ -114,7 +144,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','sale')]</field>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
@@ -127,11 +157,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','purchase')]</field>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
         </record>
         <menuitem id="menu_action_pay_vou_voucher_list"
         action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
-        
+
         <!-- Journal Vouchers -->
         <record model="ir.actions.act_window" id="action_voucher_list">
             <field name="name">Journal Vouchers</field>
@@ -139,134 +169,21 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="search_view_id" ref="view_voucher_filter"/>
         </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
-        
-<!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
-<!--            <field name="name">Cash Receipt</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'rec_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_receipt_cashreceipt_voucher_list"-->
-<!--        action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>-->
 
-<!--        <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">-->
-<!--            <field name="name">Bank Receipt</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','bank_rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'bank_rec_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_receipt_bakreceipt_voucher_list"-->
-<!--        action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>-->
-
-        <!--  End Receipt Vouchers -->
-
-
-        <!-- Payment Vouchers -->
-<!--        <record model="ir.actions.act_window" id="action_payments_voucher_list">-->
-<!--            <field name="name">Payable Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','like','pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_voucher_list"-->
-<!--        action="action_payments_voucher_list" parent="account.menu_finance_entries" sequence="8"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">-->
-<!--            <field name="name">Cash Payment</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_cashpay_voucher_list"-->
-<!--        action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">-->
-<!--            <field name="name">Bank Payment</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','bank_pay_voucher')]</field>-->
-<!--            <field name="context">{'type':'bank_pay_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_payments_bankpay_voucher_list"-->
-<!--        action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>-->
-
-       <!-- End Payment Vouchers -->
-
-        <!-- Other Voucher Enries -->
-<!--        <record model="ir.actions.act_window" id="action_other_voucher_list">-->
-<!--            <field name="name">Other Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_other_voucher_list"-->
-<!--        action="action_other_voucher_list" parent="account.menu_finance_entries" sequence="8"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_cont_voucher_form">-->
-<!--            <field name="name">Contra Entries</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','cont_voucher')]</field>-->
-<!--            <field name="context">{'type':'cont_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_cont_voucher_form"-->
-<!--        action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">-->
-<!--            <field name="name">Journal Sale</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_sale_vou')]</field>-->
-<!--            <field name="context">{'type':'journal_sale_vou'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_sale_voucher_form"-->
-<!--        action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">-->
-<!--            <field name="name">Journal Purchase</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_pur_voucher')]</field>-->
-<!--            <field name="context">{'type':'journal_pur_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_pur_voucher_form"-->
-<!--        action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>-->
-
-<!--        <record model="ir.actions.act_window" id="action_view_jour_voucher_form">-->
-<!--            <field name="name">Journal Voucher</field>-->
-<!--            <field name="res_model">account.voucher</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="view_id" eval="view_voucher_tree"/>-->
-<!--            <field name="domain">[('type','=','journal_voucher')]</field>-->
-<!--            <field name="context">{'type':'journal_voucher'}</field>-->
-<!--        </record>-->
-<!--        <menuitem id="menu_action_view_jour_voucher_form"-->
-<!--            action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>-->
+        <record id="action_cheque_register" model="ir.actions.act_window">
+            <field name="name">Cheque Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_voucher_tree"/>
+            <field name="search_view_id" ref="view_voucher_filter_new"/>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
+        </record>
+        <menuitem action="action_cheque_register" id="menu_action_cheque_register" parent="account.menu_finance_bank_and_cash"/>
 
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index ceb8da48722..c4d0b66f8dc 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -28,7 +28,6 @@
             <field name="name">done</field>
             <field name="action">write({'state':'posted'})
             proforma_voucher()</field>
-            <field name="flow_stop">True</field>
             <field name="kind">function</field>
         </record>
         
@@ -39,6 +38,21 @@
             <field name="kind">function</field>
         </record>
         
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">cancel</field>
+            <field name="action">write({'state':'cancel'})</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="act_audit" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">audit</field>
+            <field name="action">write({'state':'audit'})</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">function</field>
+        </record>
+        
         <record id="t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_proforma"/>
@@ -65,16 +79,34 @@
             <field name="signal">recheck_voucher</field>
         </record>
         
+        <record id="t10" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_audit"/>
+            <field name="signal">audit_complete</field>
+        </record>
+        
         <record id="t5" model="workflow.transition">
             <field name="act_from" ref="act_recheck"/>
-            <field name="act_to" ref="act_draft"/>
-            <field name="signal">action_cancel_draft</field>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_voucher</field>
         </record>
         
         <record id="t6" model="workflow.transition">
             <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_voucher</field>
+        </record>
+        
+        <record id="t7" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_voucher</field>
+        </record>
+        
+        <record id="t8" model="workflow.transition">
+            <field name="act_from" ref="act_cancel"/>
             <field name="act_to" ref="act_draft"/>
-            <field name="signal">action_cancel_draft</field>
+            <field name="signal">cancel_to_draft</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher_payment/__init__.py b/addons/account_voucher_payment/__init__.py
index 75d9f73de64..ad7558e11ee 100755
--- a/addons/account_voucher_payment/__init__.py
+++ b/addons/account_voucher_payment/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 import account_voucher_payment
-import account_voucher_unreconcile
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
index fa1b37399f6..fc4ce593eac 100755
--- a/addons/account_voucher_payment/__openerp__.py
+++ b/addons/account_voucher_payment/__openerp__.py
@@ -22,9 +22,8 @@
     "name" : "Invoice Payment/Receipt by Vouchers.",
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
-    "description": """This module includes :
-    * It reconcile the invoice (supplier, customer) while paying through
-    Accounting Vouchers
+    "description": """Extension Account Voucher module includes allows to link payment / receipt 
+    entries with voucher, also automatically reconcile during the payment and receipt entries
     """,
     "category" : "Generic Modules/Indian Accounting",
     "website" : "http://tinyerpindia.com",
@@ -38,8 +37,10 @@
 
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
+        "wizard/account_voucher_unreconcile_view.xml",
         "account_voucher_payment_view.xml",
-        "account_voucher_payment_wizard.xml"
+
     ],
     "test" : [
 #        "test/account_voucher.yml",
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index d87802e0e1a..5d611131527 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -3,20 +3,19 @@
     <data>
         <!--
         Voucher line extension
-    -->
-        
+        -->
         <record id="view_voucher_form" model="ir.ui.view">
             <field name="name">account.voucher.line.form.inherit</field>
             <field name="model">account.voucher.line</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
             <field name="arch" type="xml">
-                    <field name="name" position="after">
-                        <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('partner_id','=',partner_id),('state','=','open')]"/>
-                    </field>
+                <field name="name" position="after">
+                    <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('partner_id','=',partner_id),('state','=','open')]"/>
+                </field>
             </field>
         </record>
-
+        
         <record id="view_voucher_form" model="ir.ui.view">
             <field name="name">account.voucher.form.inherit</field>
             <field name="model">account.voucher</field>
@@ -40,16 +39,15 @@
             </field>
         </record>
         
-        
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.inherit</field>
             <field name="model">account.move.line</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_move_line_form"/>
             <field name="arch" type="xml">
-                    <field name="invoice" position="replace">
-                        <field name="voucher_invoice"/>
-                    </field>
+                <field name="invoice" position="replace">
+                    <field name="voucher_invoice"/>
+                </field>
             </field>
         </record>
         
@@ -59,11 +57,22 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_move_line_tree"/>
             <field name="arch" type="xml">
-                    <field name="invoice" position="replace">
-                        <field name="voucher_invoice"/>
-                    </field>
+                <field name="invoice" position="replace">
+                    <field name="voucher_invoice"/>
+                </field>
             </field>
         </record>
         
+        <record model="ir.ui.view" id="view_voucher_form_one">
+            <field name="name">account.voucher.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_voucher_form"/>
+            <field name="arch" type="xml">
+                <button name="cancel_to_draft" position="before">
+                    <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
+                </button>
+            </field>
+        </record>    
     </data>
 </openerp>
diff --git a/addons/account_voucher_payment/account_voucher_payment_wizard.xml b/addons/account_voucher_payment/account_voucher_payment_wizard.xml
deleted file mode 100644
index 0551b1bbcb5..00000000000
--- a/addons/account_voucher_payment/account_voucher_payment_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <wizard 
-            id="wizard_unreconcile_voucher" 
-            menu="True" 
-            model="account.voucher" 
-            name="account.voucher.unreconcile" 
-            string="Unreconcile entries"/>
-    </data>
-</openerp>
diff --git a/addons/account_voucher_payment/account_voucher_unreconcile.py b/addons/account_voucher_payment/account_voucher_unreconcile.py
deleted file mode 100644
index f36af98dc1c..00000000000
--- a/addons/account_voucher_payment/account_voucher_unreconcile.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- encoding: 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/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-_info_form = '''<?xml version="1.0"?>
-<form string="Unreconciliation">
-    <separator string="Unreconciliation transactions" colspan="4"/>
-    <image name="gtk-dialog-info" colspan="2"/>
-    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-</form>'''
-
-def _trans_unrec(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    voucher = pool.get('account.voucher').browse(cr, uid, data.get('id'))
-    recs = []
-    for line in voucher.move_ids:
-        if line.reconcile_id:
-            recs = [line.reconcile_id.id]
-
-    for rec in recs:
-        pool.get('account.move.reconcile').unlink(cr, uid, rec)
-    return {}
-
-class wiz_unreconcile(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel'), ('unrec', 'Unreconcile')]}
-        },
-        'unrec': {
-            'actions': [_trans_unrec],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_unreconcile('account.voucher.unreconcile')
-
diff --git a/addons/account_voucher_payment/security/ir.model.access.csv b/addons/account_voucher_payment/security/ir.model.access.csv
new file mode 100644
index 00000000000..5ef781764a0
--- /dev/null
+++ b/addons/account_voucher_payment/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_voucher_unreconcile_user","account.voucher.unreconcile","model_account_voucher_unreconcile","account.group_account_user",1,0,0,0
+"access_account_voucher_unreconcile_manager","account.voucher.unreconcile","model_account_voucher_unreconcile","account.group_account_manager",1,1,1,1
diff --git a/addons/account_voucher_payment/wizard/__init__.py b/addons/account_voucher_payment/wizard/__init__.py
new file mode 100644
index 00000000000..32ab938c5a6
--- /dev/null
+++ b/addons/account_voucher_payment/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: 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/>.     
+#
+##############################################################################
+
+import account_voucher_unreconcile
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
new file mode 100644
index 00000000000..d6f468a1ab2
--- /dev/null
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
@@ -0,0 +1,46 @@
+# -*- encoding: 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 account_voucher_unreconcile(osv.osv_memory):
+    _name = "account.voucher.unreconcile"
+    _description = "Account voucher unreconcile"
+    
+    def trans_unrec(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        obj_voucher = self.pool.get('account.voucher')
+        obj_reconcile = self.pool.get('account.move.reconcile')
+        if context.get('active_id'):
+            voucher = obj_voucher.browse(cr, uid, context.get('active_id'), context=context)
+            recs = []
+            for line in voucher.move_ids:
+                if line.reconcile_id:
+                    recs = [line.reconcile_id.id]
+        
+            for rec in recs:
+                obj_reconcile.unlink(cr, uid, rec)
+                
+        return {}
+
+account_voucher_unreconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
new file mode 100644
index 00000000000..70c54e61b70
--- /dev/null
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    	<record id="view_account_voucher_unreconcile" model="ir.ui.view">
+            <field name="name">Account voucher unreconcile</field>
+            <field name="model">account.voucher.unreconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Unreconciliation">
+    			<separator colspan="4" string="Unreconciliation transactions" />
+    			<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+              	<separator colspan="4"/>
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+		
+	<act_window name="Unreconcile entries"		    
+		    res_model="account.voucher.unreconcile"
+		    src_model="account.voucher"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_account_voucher_unreconcile"/>
+     
+     </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/analytic/__init__.py b/addons/analytic/__init__.py
index dc48b6f4001..d0175cf1424 100644
--- a/addons/analytic/__init__.py
+++ b/addons/analytic/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import project
+import analytic
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/analytic/project.py b/addons/analytic/analytic.py
similarity index 100%
rename from addons/analytic/project.py
rename to addons/analytic/analytic.py
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
new file mode 100644
index 00000000000..170243cf16e
--- /dev/null
+++ b/addons/analytic/i18n/analytic.pot
@@ -0,0 +1,251 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-06-18 10:59:19+0000\n"
+"PO-Revision-Date: 2010-06-18 10:59:19+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: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid "The amount expressed in the related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid "Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid "* When an account is created its in 'Draft' state.                                  \n"
+"* If any associated partner is there, it can be in 'Open' state.                                  \n"
+"* If any pending balance is there it can be in 'Pending'.                                   \n"
+"* And finally when all the transactions are over, it can be in 'Close' state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project.                                 \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid "Calculated by multiplying the quantity and the price given in the Product's cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
+
diff --git a/addons/analytic/i18n/en_US.po b/addons/analytic/i18n/en_US.po
new file mode 100644
index 00000000000..65db82b92be
--- /dev/null
+++ b/addons/analytic/i18n/en_US.po
@@ -0,0 +1,251 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-06-18 11:01:12+0000\n"
+"PO-Revision-Date: 2010-06-18 11:01:12+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: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid "The amount expressed in the related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid "Module for defining analytic accounting object.\n"
+"    "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid "* When an account is created its in 'Draft' state.                                  \n"
+"* If any associated partner is there, it can be in 'Open' state.                                  \n"
+"* If any pending balance is there it can be in 'Pending'.                                   \n"
+"* And finally when all the transactions are over, it can be in 'Close' state.                                   \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project.                                 \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid "Calculated by multiplying the quantity and the price given in the Product's cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
+
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 43f61ed2392..38d3f2e787e 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Profile',
     'description': """This module is to create Profile for Associates""",
     'author': 'Tiny',
-    'depends': ['membership', 'board_association'],
+    'depends': ['membership', 'event'],
     'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 586ed3f8639..ab437baf2c8 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -22,7 +22,6 @@
 from osv import fields, osv
 import pooler
 
-
 class profile_association_config_install_modules_wizard(osv.osv_memory):
     _name='profile.association.config.install_modules_wizard'
     _inherit = 'res.config.installer'
@@ -30,9 +29,7 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
     _columns = {
         'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
         'project':fields.boolean('Project Management'),
-        'board_document':fields.boolean('Document Management', help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
-        'segmentation':fields.boolean('Segmentation'),
-        'crm_configuration' : fields.boolean('Partner Relation & Calendars'),
+        'event_project':fields.boolean('Organization and management of events', help="This module allows you to create retro planning for managing your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'wiki': fields.boolean('Wiki', 
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 0d0a65b3644..c1ee9e163fe 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -24,10 +24,10 @@
                   <field name="project"/>
                   <field name="project_gtd"/>
                   <field name="wiki"/>
+                  <separator string="Event Management" colspan="4"/>
+                  <field name="event_project"/>
                   <separator string="Resources Management" colspan="4"/>
                   <field name="hr_expense"/>
-                  <separator string="Relationship Management" colspan="4"/>
-                  <field name="crm_configuration"/>
                 </group>
               </data>
             </field>
diff --git a/addons/association/security/ir.model.access.csv b/addons/association/security/ir.model.access.csv
index 2fb5590818e..0343f29f43a 100644
--- a/addons/association/security/ir.model.access.csv
+++ b/addons/association/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_profile_association_wizard_install","profile association wizard install","model_profile_association_config_install_modules_wizard","base.group_system",1,1,1,1
diff --git a/addons/auction/barcode/code128.py b/addons/auction/barcode/code128.py
index 0cd75e2ddcc..e19193bf6c6 100644
--- a/addons/auction/barcode/code128.py
+++ b/addons/auction/barcode/code128.py
@@ -177,7 +177,7 @@ class Code128(MultiWidthBarcode):
     Code 128 can also encode digits at double density (2 per byte)
     and has a mandatory checksum.  Code 128 is well supported and
     commonly used -- for example, by UPS for tracking labels.
-    
+
     Because of these qualities, Code 128 is probably the best choice
     for a linear symbology today (assuming you have a choice).
 
@@ -185,11 +185,11 @@ class Code128(MultiWidthBarcode):
 
         value (int, or numeric string. required.):
             The value to encode.
-   
+
         xdim (float, default .0075):
             X-Dimension, or width of the smallest element
             Minumum is .0075 inch (7.5 mils).
-            
+
         height (float, see default below):
             Height of the symbol.  Default is the height of the two
             bearer bars (if they exist) plus the greater of .25 inch
@@ -197,14 +197,14 @@ class Code128(MultiWidthBarcode):
 
         quiet (bool, default 1):
             Wether to include quiet zones in the symbol.
-            
+
         lquiet (float, see default below):
             Quiet zone size to left of code, if quiet is true.
             Default is the greater of .25 inch, or 10 xdim
-            
+
         rquiet (float, defaults as above):
             Quiet zone size to right left of code, if quiet is true.
-            
+
     Sources of Information on Code 128:
 
     http://www.semiconductor.agilent.com/barcode/sg/Misc/code_128.html
@@ -223,7 +223,7 @@ class Code128(MultiWidthBarcode):
 
         if type(value) is type(1):
             value = str(value)
-            
+
         for (k, v) in args.items():
             setattr(self, k, v)
 
@@ -288,12 +288,11 @@ class Code128(MultiWidthBarcode):
         if l[1] in tos:
             l[:2] = ['START_' + l[1][-1]]
 
-#        print `l`
 
         # encode into numbers
         start, set, shset = setmap[l[0]]
         e = [start]
-        
+
         l = l[1:-1]
         while l:
             c = l[0]
diff --git a/addons/auction/barcode/test.py b/addons/auction/barcode/test.py
index 135f4ae2641..068562c75bd 100644
--- a/addons/auction/barcode/test.py
+++ b/addons/auction/barcode/test.py
@@ -34,8 +34,6 @@ def run():
     story.append(Extended93("L@@K! Code 93 :-)")) #, xdim=0.005 * inch))
     story.append(Paragraph('Code 128', styleN))
     c=Code128("AB-12345678") #, xdim=0.005 * inch)
-    #print 'WIDTH =', (c.width / inch), 'XDIM =', (c.xdim / inch)
-    #print 'LQ =', (c.lquiet / inch), 'RQ =', (c.rquiet / inch)
     story.append(c)
     story.append(Paragraph('USPS FIM', styleN))
     story.append(FIM("A"))
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 674b5821309..ca4b30bd688 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -58,8 +58,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_auction_manager_form"/>
         </record>
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem name="Auction" id="menu_board_auction" parent="base.dashboard" />
+        <menuitem icon="terp-graph" name="Dashboard" id="menu_board_auction" parent="auction_report_menu" sequence="0"/>
         <menuitem
             name="Auction Member"
             action="open_board_auction"
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index d3f6c3e43bf..1a45352ff32 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 8e02e986623..82356ca586c 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -2552,4 +2552,87 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
 
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index d64c962fe3f..7cbabcf25ec 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Промяна в проект"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "продавач"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Форма за депозит"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Купувач"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Брой обекти"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Антики/книги, списъци и тн."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1792,8 +1743,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Oбекти"
@@ -1815,12 +1765,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1830,17 +1777,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1992,8 +1934,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2017,16 +1958,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2098,8 +2037,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2119,8 +2057,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2197,8 +2134,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2235,8 +2171,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2265,8 +2200,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2412,16 +2346,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2431,8 +2360,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2494,8 +2422,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2559,3 +2486,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 5ba2bb9296d..e8e41af27cf 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objekti"
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index d0db3c6c89f..030231d6b16 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-11-17 09:13+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -33,12 +33,9 @@ msgid "Set to draft"
 msgstr "Canvia a esborrany"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Venedor"
 
@@ -91,23 +88,18 @@ msgid "Deposit Form"
 msgstr "Formulari de dipòsit"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Núm. de objectes"
 
@@ -132,8 +124,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antiguetats / Llibres, manuscrits, etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Justificant de dipòsit"
 
@@ -205,8 +196,7 @@ msgid "Objects by Auction"
 msgstr "Objectes per subhasta"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Núm. de llista"
 
@@ -241,8 +231,7 @@ msgid "Contemporary Art"
 msgstr "Art contemporani"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref."
 
@@ -264,8 +253,7 @@ msgstr ""
 "Registro de sortida (resp. Registre d'entrada)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Total adj."
 
@@ -275,8 +263,7 @@ msgid "Net margin (%)"
 msgstr "Marge neto (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -304,9 +291,7 @@ msgid "Seller Costs"
 msgstr "Costos del venedor"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -329,8 +314,7 @@ msgid "Contact"
 msgstr "Contacte"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "Nº obj ret"
@@ -371,8 +355,7 @@ msgid "Sold Objects"
 msgstr "Objectes venuts"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Suma marge net"
 
@@ -382,9 +365,7 @@ msgid "Deposit Border Form"
 msgstr "Formulari justificant de dipòsit"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Aposta"
@@ -395,10 +376,8 @@ msgid "Langage"
 msgstr "Idioma"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objecte"
 
@@ -431,11 +410,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Informe comprador de subhastes vista formulari"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Estat"
@@ -451,8 +428,7 @@ msgid "Antique/Cartoons"
 msgstr "Antiguitats / Còmics"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -537,8 +513,7 @@ msgid "auction.dates"
 msgstr "subhasta.dates"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Compradors"
 
@@ -765,8 +740,7 @@ msgid "Antique/Toys"
 msgstr "Antiguitats / Juguets"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Creat per"
 
@@ -894,8 +868,7 @@ msgid "Gestion emporte"
 msgstr "Gestió sortida objectes"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat. N."
 
@@ -930,8 +903,7 @@ msgid "API ID"
 msgstr "ID API"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID aposta"
 
@@ -984,16 +956,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antigüedades / Estores i tèxtils"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Data"
@@ -1034,14 +1003,12 @@ msgid "Specific Costs"
 msgstr "Costos específics"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Suma adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Subhastes"
 
@@ -1076,8 +1043,7 @@ msgid "Aie Category"
 msgstr "Categoria encontrada"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Núm"
@@ -1125,8 +1091,7 @@ msgid "Detailed lots"
 msgstr "Lots detallats"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Estadística objectes"
 
@@ -1141,8 +1106,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Envia resultats a Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat.N"
 
@@ -1186,8 +1150,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Subtotal:"
 
@@ -1203,8 +1166,7 @@ msgid "Invoice Number"
 msgstr "Número factura"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1227,8 +1189,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1256,8 +1217,7 @@ msgid "Login"
 msgstr "Entra"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Per pagar"
 
@@ -1277,8 +1237,7 @@ msgid "Seller Form"
 msgstr "Formulari venedor"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Categoria objecte"
 
@@ -1347,8 +1306,7 @@ msgid "Payment's history"
 msgstr "Historial de pagaments"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Document"
 
@@ -1420,8 +1378,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Arte cont. / Curiositats"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1469,8 +1426,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Art cont. / Joies"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventari"
 
@@ -1480,8 +1436,7 @@ msgid "Next Auctions"
 msgstr "Properes subhastes"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1613,16 +1568,14 @@ msgid "Buyer Journal"
 msgstr "Diari comprador"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Pagat"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -1653,10 +1606,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antigüedades / Escultura, bronze, etc."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1802,8 +1753,7 @@ msgid "Plate Number:"
 msgstr "Número placa:"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objectes"
@@ -1825,12 +1775,9 @@ msgid "Allow Negative Amount"
 msgstr "Permet import negatiu"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Subhasta"
 
@@ -1840,17 +1787,12 @@ msgid "Cont. Art/Shows"
 msgstr "Art cont. / Espectacles"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Data subhasta"
@@ -2002,8 +1944,7 @@ msgstr "Primer dia exposició"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 "Atenció, això eliminarà el preu d'adjudicació de l'objecte i el seu "
 "comprador!"
@@ -2029,16 +1970,14 @@ msgid "Income Account"
 msgstr "Compte d'ingressos"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Ingrés net"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Límit"
 
@@ -2110,8 +2049,7 @@ msgid "Closed"
 msgstr "Tancat"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Comissió"
 
@@ -2131,8 +2069,7 @@ msgid "Employee"
 msgstr "Empleat"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Adj.(EUR)"
 
@@ -2209,8 +2146,7 @@ msgid "Invoiced"
 msgstr "Facturat"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Per portar"
 
@@ -2247,8 +2183,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "Error! No podeu crear membres associats recursivament."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2277,8 +2212,7 @@ msgid "Adj"
 msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Dates subhasta"
 
@@ -2424,16 +2358,11 @@ msgid "Report Sign In/Out"
 msgstr "Informe registre entrada/sortida"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Descripció"
 
@@ -2443,8 +2372,7 @@ msgid "Cont. Art/Arts"
 msgstr "Art cont. / Arts"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Preu adjudicació"
@@ -2506,8 +2434,7 @@ msgid "Pay objects"
 msgstr "Paga objectes"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Nº objectes"
 
@@ -2571,3 +2498,88 @@ msgstr "Historial subhasta"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Comandes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objectes per dia"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Gestor de subhastes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Resum aportat pel usuari"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Membre de subhastes"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Taulell membre subastes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestor de subhastes "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Taulell per a subhastes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimacions/Adjudicació"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total adjudicacions"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últims objectes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últims dipòsits"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Els meus objectes per dia"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "El meu tauler"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Tauler gestor de subhastes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Mín/Adj/Màx"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Els meus últims objectes"
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index 05109cadcb8..17988020ef9 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Prodávající"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Kupující"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objekty dle aukce"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr "Prodané objekty"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objekt"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Stav"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index ff3156a625a..b1da20db4bd 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Setze auf Entwurf"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Einlieferer"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Zuschlag Formular"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Käufer"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Anzahl Objekte"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antiquitäten/Bücher, Manuskripte etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Anzahlungslimit"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objekte nach Auktionen"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Listennummer"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Zeitgenössische Kunst"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref."
 
@@ -262,8 +251,7 @@ msgstr ""
 "Fehler: Sign In (oder Sign Out) sollte auf Sign Out ( oder Sign In) erfolgen."
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Summe Zuschlag"
 
@@ -273,8 +261,7 @@ msgid "Net margin (%)"
 msgstr "Netto Spanne (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -302,9 +289,7 @@ msgid "Seller Costs"
 msgstr "Kosten Einlieferer"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -327,8 +312,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "# einbeh. Obj."
@@ -369,8 +353,7 @@ msgid "Sold Objects"
 msgstr "Verkaufte Objekte"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Summe Netto Marge"
 
@@ -380,9 +363,7 @@ msgid "Deposit Border Form"
 msgstr "Anzahlungslimit Formular"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Gebote"
@@ -393,10 +374,8 @@ msgid "Langage"
 msgstr "Sprache"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objekt"
 
@@ -429,11 +408,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Report Auktion aus Käufersicht"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Status"
@@ -449,8 +426,7 @@ msgid "Antique/Cartoons"
 msgstr "Antik/Cartoons"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -536,8 +512,7 @@ msgid "auction.dates"
 msgstr "auction.dates"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Käufer"
 
@@ -765,8 +740,7 @@ msgid "Antique/Toys"
 msgstr "Antik/Spielzeug"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Erzeugt durch"
 
@@ -894,8 +868,7 @@ msgid "Gestion emporte"
 msgstr "Nachlassverwaltung"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Kategorie Neu"
 
@@ -930,8 +903,7 @@ msgid "API ID"
 msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "Gebot ID"
 
@@ -984,16 +956,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antik/Teppiche und Textilien"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Zuschlag"
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Datum"
@@ -1034,14 +1003,12 @@ msgid "Specific Costs"
 msgstr "Zusatzkosten"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Zuschlagsbetrag"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Auktionen"
 
@@ -1076,8 +1043,7 @@ msgid "Aie Category"
 msgstr "Aie Kategorie"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Nummer"
@@ -1125,8 +1091,7 @@ msgid "Detailed lots"
 msgstr "Details Auktionslos"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Auswertungen Versteigerungsobjekte"
 
@@ -1141,8 +1106,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Sende Ergebnis an auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Kat. Neu"
 
@@ -1186,8 +1150,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Zwischensumme"
 
@@ -1203,8 +1166,7 @@ msgid "Invoice Number"
 msgstr "Rechnungsnummer"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1227,8 +1189,7 @@ msgid "Name"
 msgstr "Name"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1256,8 +1217,7 @@ msgid "Login"
 msgstr "Login"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Zahlung bis"
 
@@ -1277,8 +1237,7 @@ msgid "Seller Form"
 msgstr "Einlieferer Formular"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Versteigerungsobjekte Kategorien"
 
@@ -1347,8 +1306,7 @@ msgid "Payment's history"
 msgstr "Historie Zahlungen"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -1420,8 +1378,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Zeitg. Kunst/Kuriositäten"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1469,8 +1426,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Zeitg. Kunst/Schmuck"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Warenbestand"
 
@@ -1480,8 +1436,7 @@ msgid "Next Auctions"
 msgstr "Kommende Auktionen"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1613,16 +1568,14 @@ msgid "Buyer Journal"
 msgstr "Käufer Journal"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Bezahlt"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1653,10 +1606,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antik/Skulpturen, Bronze"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Gesamt:"
 
@@ -1802,8 +1753,7 @@ msgid "Plate Number:"
 msgstr "Tafel Nummer:"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Versteigerungsobjekte"
@@ -1825,12 +1775,9 @@ msgid "Allow Negative Amount"
 msgstr "Erlaube negativen Betrag"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Auktion"
 
@@ -1840,17 +1787,12 @@ msgid "Cont. Art/Shows"
 msgstr "Zeitg. Kunst/Präsentation"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Datum Auktion"
@@ -2002,8 +1944,7 @@ msgstr "Erster Tag Exposition"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 "Warnung, diese Aktion wird alle Zuschlagsbeträge der Objekte und Ihre Käufer "
 "löschen !"
@@ -2029,16 +1970,14 @@ msgid "Income Account"
 msgstr "Ertragskonto"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Netto Einnahmen"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Limit"
 
@@ -2110,8 +2049,7 @@ msgid "Closed"
 msgstr "Beendet"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Auktionsgebühr"
 
@@ -2131,8 +2069,7 @@ msgid "Employee"
 msgstr "Mitarbeiter"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Zuschlag (EUR)"
 
@@ -2209,8 +2146,7 @@ msgid "Invoiced"
 msgstr "Berechnet"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Mitgenommen"
 
@@ -2247,8 +2183,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2277,8 +2212,7 @@ msgid "Adj"
 msgstr "Zuschlag"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Termine Auktionen"
 
@@ -2424,16 +2358,11 @@ msgid "Report Sign In/Out"
 msgstr "Report An/Abmeldung"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2443,8 +2372,7 @@ msgid "Cont. Art/Arts"
 msgstr "Zeitg. Kunst/Kunst"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Zuschlagspreis"
@@ -2506,8 +2434,7 @@ msgid "Pay objects"
 msgstr "Zahle Objekte"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "# Objekte"
 
@@ -2571,3 +2498,88 @@ msgstr "Auktionen Historie"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Aufträge"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objekte nach Tagen"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Auktionen Manager"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Summierung nach Benutzern"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Auktionen Teilnehmer"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Auktion Mitglieder Tafel"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Auktionen Manager "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Tafel für Auktion"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Erwartungen/Schätzwerte"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Summe Versteigerungen"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Letzte Objekte"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Letzte Einlagen"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menü"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Meine Objekte nach Tagen"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Mein Dashboard"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Auktionen Manager Dashboard"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Min / +/- 0 /Max"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Meine letzten Objekte"
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 60d2dfd08d7..bba4f77dc0f 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -33,12 +33,9 @@ msgid "Set to draft"
 msgstr "Ρύθμιση ως πρόχειρο"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Πωλητής"
 
@@ -91,23 +88,18 @@ msgid "Deposit Form"
 msgstr "Φόρμα κατάθεσης"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Αγοραστής"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Αριθμόες αντικειμένων"
 
@@ -132,8 +124,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Αντίκες/Βιβλία, χειρόγραφα,κα."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Κατάθεση ορίων"
 
@@ -205,8 +196,7 @@ msgid "Objects by Auction"
 msgstr "Αντικείμενα σε Δημοπρασία"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Αριθμός καταλόγου"
 
@@ -241,8 +231,7 @@ msgid "Contemporary Art"
 msgstr "Σύγχρονη Τέχνη"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Αναφορά"
 
@@ -263,8 +252,7 @@ msgstr ""
 "Σφάλμα: Η Είσοδος (ή Έξοδος) πρέπει να ακολουθείται από Έξοδο (Είσοδο)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Συνολική προσαρμογή"
 
@@ -274,8 +262,7 @@ msgid "Net margin (%)"
 msgstr "Καθαρό περιθώριο (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -303,9 +290,7 @@ msgid "Seller Costs"
 msgstr "Έξοδα πωλητών"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -328,8 +313,7 @@ msgid "Contact"
 msgstr "Επικοινωνία"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "Αριθμός αντικειμένων που επεστράφησαν"
@@ -370,8 +354,7 @@ msgid "Sold Objects"
 msgstr "Πουλημένα αντικείμενα"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Σύνολο καθαρού περιθωρίου"
 
@@ -381,9 +364,7 @@ msgid "Deposit Border Form"
 msgstr "Κατάθεση φόρμας συνόρων"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Προσφορά"
@@ -394,10 +375,8 @@ msgid "Langage"
 msgstr "Γλώσσα"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Αντικείμενο"
 
@@ -430,11 +409,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Έντυπο έκθεσης άποψης των αγοραστών δημοπρασιών"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Κατάσταση"
@@ -450,8 +427,7 @@ msgid "Antique/Cartoons"
 msgstr "Αντίκες/Γελοιογραφίες"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -537,8 +513,7 @@ msgid "auction.dates"
 msgstr "Δημοπρασίες.Ημερομηνίες"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Αγοραστές"
 
@@ -550,7 +525,7 @@ msgid "Amount paid"
 msgstr "Ποσό που πληρώθηκε"
 
 #. module: auction
-#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
+#: view:board.board:0
 msgid "My Latest Deposits"
 msgstr "Οι Τελευταίες Καταθέσεις μου"
 
@@ -767,8 +742,7 @@ msgid "Antique/Toys"
 msgstr "Αντίκες/Παιχνίδια"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Δημιουργήθηκε από"
 
@@ -897,8 +871,7 @@ msgid "Gestion emporte"
 msgstr "Διαχείριση Κερδισμένων"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat. N."
 
@@ -933,8 +906,7 @@ msgid "API ID"
 msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "Ταυτότητα προσφοράς"
 
@@ -987,16 +959,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Αντίκες/Χαλιά και υφάσματα"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Προσαρμογή"
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -1037,14 +1006,12 @@ msgid "Specific Costs"
 msgstr "Ειδικά έξοδα"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Προσαρμογή συνόλου"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Δημοπρασίες"
 
@@ -1079,8 +1046,7 @@ msgid "Aie Category"
 msgstr "Σε κατηγορία"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Num"
@@ -1128,8 +1094,7 @@ msgid "Detailed lots"
 msgstr "Λεπτομέρειες παρτίδων"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:board.board:0
 msgid "Objects statistics"
 msgstr "Στατιστικά Αντικειμένων"
 
@@ -1144,8 +1109,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Αποστολή αποτελεσμάτων στο Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat.N"
 
@@ -1189,8 +1153,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Μερικό σύνολο:"
 
@@ -1206,8 +1169,7 @@ msgid "Invoice Number"
 msgstr "Αριθμός Τιμολογίου"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1230,8 +1192,7 @@ msgid "Name"
 msgstr "Όνομα"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1259,8 +1220,7 @@ msgid "Login"
 msgstr "Είσοδος"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Για πληρωμή"
 
@@ -1280,8 +1240,7 @@ msgid "Seller Form"
 msgstr "Φόρμα πωλητή"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Κατηγορία αντικειμένου"
 
@@ -1350,8 +1309,7 @@ msgid "Payment's history"
 msgstr "Ιστορικό πληρωμών"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Έγγραφο"
 
@@ -1423,8 +1381,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Cont. Art/Curiosa"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1472,8 +1429,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Συνέχεια σε Τέχνη/Κοσμήματα"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Απογραφή"
 
@@ -1483,8 +1439,7 @@ msgid "Next Auctions"
 msgstr "Επόμενες Δημοπρασίες"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1616,16 +1571,14 @@ msgid "Buyer Journal"
 msgstr "Ημερολόγιο Αγοραστή"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Πληρωμένα"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
@@ -1656,10 +1609,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1803,8 +1754,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1826,12 +1776,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1841,17 +1788,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -2003,8 +1945,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2028,16 +1969,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2109,8 +2048,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2130,8 +2068,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2208,8 +2145,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2246,8 +2182,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2276,8 +2211,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2423,16 +2357,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2442,8 +2371,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2505,8 +2433,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2570,3 +2497,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Αντικείμενα ανά Ημέρα"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Υπεύθυνος Δημοπρασίας"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Περίληψη χτυπημάτων ανά χρήστη"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Μέλος Δημοπρασίας"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Πίνακας μέλους δημοπρασίας"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Υπεύθυνος Δημοπρασίας "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Πίνακας Δημοπρασίας"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Εκτιμήσεις/Κατακυρώσεις"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Σύνολο Κατακυρώσεων"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Τελευταία αντικείμενα"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Τελευταίες καταθέσεις"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Μενού"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Τα Ανικείμενά μου ανά Ημέρα"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Ο Πίνακάς μου"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Πίνακας Υπεύθυνου Δημοπρασίας"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Ελαχ./Επικ./Μέγ."
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Τα Τελευταία μου Αντικείμενα"
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index 27873044f78..bb8ee91bb67 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-11-17 09:12+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -33,12 +33,9 @@ msgid "Set to draft"
 msgstr "Cambiar a borrador"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Vendedor"
 
@@ -91,23 +88,18 @@ msgid "Deposit Form"
 msgstr "Formulario de depósito"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Núm. de objetos"
 
@@ -132,8 +124,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antigüedades / Libros, manuscritos, etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Justificante de depósito"
 
@@ -205,8 +196,7 @@ msgid "Objects by Auction"
 msgstr "Objetos por subasta"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Núm. de lista"
 
@@ -241,8 +231,7 @@ msgid "Contemporary Art"
 msgstr "Arte contemporáneo"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref."
 
@@ -264,8 +253,7 @@ msgstr ""
 "Registro de salida (resp. Registro de entrada)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Total adj."
 
@@ -275,8 +263,7 @@ msgid "Net margin (%)"
 msgstr "Margen neto (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -304,9 +291,7 @@ msgid "Seller Costs"
 msgstr "Costes del vendedor"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -329,8 +314,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "Nº obj ret"
@@ -371,8 +355,7 @@ msgid "Sold Objects"
 msgstr "Objetos vendidos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Suma margen neto"
 
@@ -382,9 +365,7 @@ msgid "Deposit Border Form"
 msgstr "Formulario justificante de depósito"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Apuesta"
@@ -395,10 +376,8 @@ msgid "Langage"
 msgstr "Idioma"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objeto"
 
@@ -431,11 +410,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Informe comprador de subastas vista formulario"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Estado"
@@ -451,8 +428,7 @@ msgid "Antique/Cartoons"
 msgstr "Antigüedades / Tebeos"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -537,8 +513,7 @@ msgid "auction.dates"
 msgstr "subasta.fechas"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Compradores"
 
@@ -765,8 +740,7 @@ msgid "Antique/Toys"
 msgstr "Antigüedades / Juguetes"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Creado por"
 
@@ -894,8 +868,7 @@ msgid "Gestion emporte"
 msgstr "Gestión salida objetos"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat. N."
 
@@ -930,8 +903,7 @@ msgid "API ID"
 msgstr "ID API"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID apuesta"
 
@@ -984,16 +956,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antigüedades / Alfombras y textiles"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Fecha"
@@ -1034,14 +1003,12 @@ msgid "Specific Costs"
 msgstr "Costes específicos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Suma adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Subastas"
 
@@ -1076,8 +1043,7 @@ msgid "Aie Category"
 msgstr "Categoria encontrada"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Núm."
@@ -1125,8 +1091,7 @@ msgid "Detailed lots"
 msgstr "Lotes detallados"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Estadísticas objetos"
 
@@ -1141,8 +1106,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Enviar resultados a Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat.N"
 
@@ -1186,8 +1150,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Subtotal:"
 
@@ -1203,8 +1166,7 @@ msgid "Invoice Number"
 msgstr "Número factura"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1227,8 +1189,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1256,8 +1217,7 @@ msgid "Login"
 msgstr "Entrar"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Para pagar"
 
@@ -1277,8 +1237,7 @@ msgid "Seller Form"
 msgstr "Formulario vendedor"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Categoría objeto"
 
@@ -1347,8 +1306,7 @@ msgid "Payment's history"
 msgstr "Historial de pagos"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Documento"
 
@@ -1420,8 +1378,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Arte cont. / Curiosidades"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1469,8 +1426,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Arte cont. / Joyas"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -1480,8 +1436,7 @@ msgid "Next Auctions"
 msgstr "Próximas subastas"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "Nº"
 
@@ -1613,16 +1568,14 @@ msgid "Buyer Journal"
 msgstr "Diario comprador"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Pagado"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -1653,10 +1606,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antigüedades / Escultura, bronze, etc."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1802,8 +1753,7 @@ msgid "Plate Number:"
 msgstr "Número placa:"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objetos"
@@ -1825,12 +1775,9 @@ msgid "Allow Negative Amount"
 msgstr "Permitir importe negativo"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Subasta"
 
@@ -1840,17 +1787,12 @@ msgid "Cont. Art/Shows"
 msgstr "Arte cont. / Espectáculos"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Fecha subasta"
@@ -2002,8 +1944,7 @@ msgstr "Primer día exposición"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 "¡Atención, ésto eliminará el precio de adjudicación del objeto y su "
 "comprador!"
@@ -2029,16 +1970,14 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Ingreso neto"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Límite"
 
@@ -2110,8 +2049,7 @@ msgid "Closed"
 msgstr "Cerrado"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Comisión"
 
@@ -2131,8 +2069,7 @@ msgid "Employee"
 msgstr "Empleado"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Adj.(EUR)"
 
@@ -2209,8 +2146,7 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Para llevar"
 
@@ -2247,8 +2183,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2277,8 +2212,7 @@ msgid "Adj"
 msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Fechas subasta"
 
@@ -2424,16 +2358,11 @@ msgid "Report Sign In/Out"
 msgstr "Informe registro entrada/salida"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -2443,8 +2372,7 @@ msgid "Cont. Art/Arts"
 msgstr "Arte cont. / Artes"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Precio adjudicación"
@@ -2506,8 +2434,7 @@ msgid "Pay objects"
 msgstr "Pagar objetos"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Nº objetos"
 
@@ -2571,3 +2498,88 @@ msgstr "Historial subasta"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Pedidos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Gestor de subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Resumen aportado por el usuario"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Miembro de subastas"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Tablero miembro subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestor de subastas "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Tablero para subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimaciones/Adjudicación"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total adjudicaciones"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últimos objetos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últimos depósitos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Mis objetos por día"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Mi tablero"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Tablero gestor de subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Mín/Adj/Máx"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Mis últimos objetos"
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index 77e3b24cc8e..0c830c013a4 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Establecer como borrador"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Vendedor"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Formulario de depósito"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Núm. de objetos"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antigüedades / Libros, manuscritos, etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Justificante de depósito"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objetos por subasta"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Núm. de lista"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Arte contemporáneo"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref."
 
@@ -263,8 +252,7 @@ msgstr ""
 "Registro de salida (resp. Registro de entrada)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Total adj."
 
@@ -274,8 +262,7 @@ msgid "Net margin (%)"
 msgstr "Margen neto (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -303,9 +290,7 @@ msgid "Seller Costs"
 msgstr "Costos del vendedor"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -328,8 +313,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "Nº obj ret"
@@ -370,8 +354,7 @@ msgid "Sold Objects"
 msgstr "Objetos vendidos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Suma margen neto"
 
@@ -381,9 +364,7 @@ msgid "Deposit Border Form"
 msgstr "Formulario comprobante de depósito"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Apuesta"
@@ -394,10 +375,8 @@ msgid "Langage"
 msgstr "Idioma"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objeto"
 
@@ -430,11 +409,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Vista del formulario de Informe del comprador de subastas"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Estado"
@@ -450,8 +427,7 @@ msgid "Antique/Cartoons"
 msgstr "Antigüedades / Historietas"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -536,8 +512,7 @@ msgid "auction.dates"
 msgstr "subasta.fechas"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Compradores"
 
@@ -764,8 +739,7 @@ msgid "Antique/Toys"
 msgstr "Antigüedades / Juguetes"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Creado por"
 
@@ -893,8 +867,7 @@ msgid "Gestion emporte"
 msgstr "Gestión salida objetos"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat. N."
 
@@ -929,8 +902,7 @@ msgid "API ID"
 msgstr "ID API"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID apuesta"
 
@@ -983,16 +955,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antigüedades / Alfombras y textiles"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Fecha"
@@ -1033,14 +1002,12 @@ msgid "Specific Costs"
 msgstr "Costos específicos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Suma adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Subastas"
 
@@ -1075,8 +1042,7 @@ msgid "Aie Category"
 msgstr "Categoría Aie"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Núm."
@@ -1124,8 +1090,7 @@ msgid "Detailed lots"
 msgstr "Lotes detallados"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Estadísticas objetos"
 
@@ -1140,8 +1105,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Enviar resultados a Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat.N"
 
@@ -1185,8 +1149,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Subtotal:"
 
@@ -1202,8 +1165,7 @@ msgid "Invoice Number"
 msgstr "Número de Factura"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1226,8 +1188,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1255,8 +1216,7 @@ msgid "Login"
 msgstr "Usuario"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Para pagar"
 
@@ -1276,8 +1236,7 @@ msgid "Seller Form"
 msgstr "Formulario vendedor"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Categoría objeto"
 
@@ -1346,8 +1305,7 @@ msgid "Payment's history"
 msgstr "Historial de pagos"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Documento"
 
@@ -1419,8 +1377,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Arte cont. / Curiosidades"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1468,8 +1425,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Arte cont. / Joyas"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -1479,8 +1435,7 @@ msgid "Next Auctions"
 msgstr "Próximas subastas"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1612,16 +1567,14 @@ msgid "Buyer Journal"
 msgstr "Diario comprador"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Pagado"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -1652,10 +1605,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antigüedades / Escultura, bronze, etc."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1801,8 +1752,7 @@ msgid "Plate Number:"
 msgstr "Número placa:"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objetos"
@@ -1824,12 +1774,9 @@ msgid "Allow Negative Amount"
 msgstr "Permitir importe negativo"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Subasta"
 
@@ -1839,17 +1786,12 @@ msgid "Cont. Art/Shows"
 msgstr "Arte cont. / Espectáculos"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Fecha subasta"
@@ -2001,8 +1943,7 @@ msgstr "Primer día exposición"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 "¡Atención, ésto eliminará el precio de adjudicación del objeto y su "
 "comprador!"
@@ -2028,16 +1969,14 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Ingreso neto"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Límite"
 
@@ -2109,8 +2048,7 @@ msgid "Closed"
 msgstr "Cerrado"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Comisión"
 
@@ -2130,8 +2068,7 @@ msgid "Employee"
 msgstr "Empleado"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Adj.(EUR)"
 
@@ -2208,8 +2145,7 @@ msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Para llevar"
 
@@ -2246,8 +2182,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2276,8 +2211,7 @@ msgid "Adj"
 msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Fechas de subasta"
 
@@ -2423,16 +2357,11 @@ msgid "Report Sign In/Out"
 msgstr "Informe registro de entrada/salida"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -2442,8 +2371,7 @@ msgid "Cont. Art/Arts"
 msgstr "Arte cont. / Artes"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Precio adjudicación"
@@ -2505,8 +2433,7 @@ msgid "Pay objects"
 msgstr "Pagar objetos"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Nº objetos"
 
@@ -2570,3 +2497,88 @@ msgstr "Historial subasta"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Pedidos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objetos por día"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Gestión de subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Resumen indicado por el usuario"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Miembro de subastas"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Tablero de miembros de subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestión de subastas "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Tablero para subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimaciones/Adjudicación"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total de adjudicaciones"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últimos objetos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últimos depósitos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Mis objetos por día"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Mi tablero"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Tablero de gestión de subastas"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Mín/Adj/Máx"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Mis últimos objetos"
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 40ab397f878..080dc4521bc 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Mettre en brouillon"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Vendeur"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Acheteur"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Nb d'objets"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antiquités/Ouvrages, Manuscrits, etc, ..."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objets par vente"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "N° de liste"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Art Contemporain"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Réf"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr "Marge nette (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -303,9 +290,7 @@ msgid "Seller Costs"
 msgstr "Coûts des vendeurs"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -328,8 +313,7 @@ msgid "Contact"
 msgstr "Contact"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -370,8 +354,7 @@ msgid "Sold Objects"
 msgstr "Objets vendus"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -381,9 +364,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Ordre d'achat"
@@ -394,10 +375,8 @@ msgid "Langage"
 msgstr "Langage"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objet"
 
@@ -430,11 +409,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "État"
@@ -450,8 +427,7 @@ msgid "Antique/Cartoons"
 msgstr "Antiquités/Bandes Dessinées"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -460,8 +436,7 @@ msgstr "Vendu"
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
-"Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
+msgstr "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -537,8 +512,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Acheteurs"
 
@@ -760,8 +734,7 @@ msgid "Antique/Toys"
 msgstr "Antiquités/Jouets"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "créé par"
 
@@ -889,8 +862,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -925,8 +897,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID de l'ordre d'achat"
 
@@ -979,16 +950,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antiquités/Tapis et Textiles"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Date"
@@ -1029,14 +997,12 @@ msgid "Specific Costs"
 msgstr "Coûts spécifiques"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Enchères"
 
@@ -1071,8 +1037,7 @@ msgid "Aie Category"
 msgstr "Aie catégorie"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1120,8 +1085,7 @@ msgid "Detailed lots"
 msgstr "Lots détaillés"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Statistiques des Objets"
 
@@ -1136,8 +1100,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Envoi des résultats vers Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1181,8 +1144,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Sous-total :"
 
@@ -1198,8 +1160,7 @@ msgid "Invoice Number"
 msgstr "Numéro de facture"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1222,8 +1183,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1251,8 +1211,7 @@ msgid "Login"
 msgstr "Connexion"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "À Payer"
 
@@ -1272,8 +1231,7 @@ msgid "Seller Form"
 msgstr "Formulaire du Vendeur"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Catégorie de l'objet"
 
@@ -1342,8 +1300,7 @@ msgid "Payment's history"
 msgstr "Historique du paiement"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Document"
 
@@ -1415,8 +1372,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1464,8 +1420,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -1475,8 +1430,7 @@ msgid "Next Auctions"
 msgstr "Prochaines ventes"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1608,16 +1562,14 @@ msgid "Buyer Journal"
 msgstr "Journal de l'acheteur"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Payé"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -1648,10 +1600,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antiquiés/Sculpture, bronze, etc, ..."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Total :"
 
@@ -1797,8 +1747,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objets"
@@ -1820,12 +1769,9 @@ msgid "Allow Negative Amount"
 msgstr "Permettre un montant négatif"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Ventes aux enchères"
 
@@ -1835,17 +1781,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Date de l'enchère"
@@ -1997,8 +1938,7 @@ msgstr "Premier jour de l'exposition"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !"
 
 #. module: auction
@@ -2022,16 +1962,14 @@ msgid "Income Account"
 msgstr "Compte des entrées"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Revenu net"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Limite"
 
@@ -2103,8 +2041,7 @@ msgid "Closed"
 msgstr "Fermé"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Commission"
 
@@ -2124,8 +2061,7 @@ msgid "Employee"
 msgstr "Employé"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Adj. (EUR)"
 
@@ -2202,8 +2138,7 @@ msgid "Invoiced"
 msgstr "Facturé"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Emporté"
 
@@ -2241,8 +2176,7 @@ msgstr ""
 "Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2271,8 +2205,7 @@ msgid "Adj"
 msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Dates des ventes aux enchères"
 
@@ -2418,16 +2351,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Description"
 
@@ -2437,8 +2365,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Prix d'adjudication"
@@ -2500,8 +2427,7 @@ msgid "Pay objects"
 msgstr "Payer les Objets"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "# d'objets"
 
@@ -2565,3 +2491,88 @@ msgstr "Historique de la vente"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Commandes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objets par Jour"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Gestionnaire des Enchères"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gestionnaire des Enchères "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimations/Adjudication"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Adjudications Totales"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Derniers Objets"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Derniers Dépôts"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menu"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Mes Objets par Jour"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Mon tableau"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Tableau du Gestionnaire des Enchères"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Min/Adj/Max"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Mes Derniers Objets"
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index fe5be11707a..177aafbf3b8 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.po
@@ -1,45 +1,42 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:09+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
+"PO-Revision-Date: 2009-11-17 09:12+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
 msgid "Total margin"
-msgstr ""
+msgstr "Marge totale"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "Passerelle SMS: clickatell"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Mettre en brouillon"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
@@ -61,28 +58,28 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "Mes objets encodés par jour"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot history"
-msgstr ""
+msgstr "Historique du Lot"
 
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Estimation moyenne"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 #: field:report.auction.view2,obj_number:0
 msgid "# of Objects"
-msgstr ""
+msgstr "# d'objets"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr ""
+msgstr "Ligne de l'ordre d'achat"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
@@ -90,30 +87,25 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
-msgstr ""
+msgstr "Acheteur"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
-msgstr ""
+msgstr "Nb d'objets"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
 msgid "Adjudication by Auction"
-msgstr ""
+msgstr "Adjudication par vente"
 
 #. module: auction
 #: rml:auction.total.rml:0
@@ -123,16 +115,15 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
 msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "Numérotation (par lot)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "Antiquités/Ouvrages, Manuscrits, etc, ..."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -140,22 +131,22 @@ msgstr ""
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Montant facturé"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "Antiquités/Étain / Cuivres"
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "Facture de l'acheteur réconciliée"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
 msgid "Mark as taken away"
-msgstr ""
+msgstr "Marquer comme emporté"
 
 #. module: auction
 #: xsl:report.auction.seller.list:0
@@ -165,18 +156,18 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr ""
+msgstr "Bordereau de dépôt"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "VAT"
-msgstr ""
+msgstr "TVA"
 
 #. module: auction
 #: view:auction.lots:0
@@ -186,69 +177,67 @@ msgstr ""
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Adjudication"
-msgstr ""
+msgstr "Adjudication"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte analytique"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "Non Classés"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
 msgid "Objects by Auction"
-msgstr ""
+msgstr "Objets par vente"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
-msgstr ""
+msgstr "N° de liste"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
 msgid "Cost Name"
-msgstr ""
+msgstr "Nom du coût"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antiques"
-msgstr ""
+msgstr "Antiquités"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
 msgid "Object Type"
-msgstr ""
+msgstr "Type de l'objet"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Message SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Contemporary Art"
-msgstr ""
+msgstr "Art Contemporain"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
-msgstr ""
+msgstr "Réf"
 
 #. module: auction
 #: field:report.auction.view,nseller:0
 msgid "No of sellers"
-msgstr ""
+msgstr "Nb de vendeurs"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -261,73 +250,70 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
 msgid "Net margin (%)"
-msgstr ""
+msgstr "Marge nette (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
-msgstr ""
+msgstr "Non Vendu"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Erreur : l'Unité Secondaire doit appartenir à une autre catégorie que "
+"l'Unité de Mesure."
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Items"
-msgstr ""
+msgstr "Articles"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax5
 #: field:auction.dates,seller_costs:0
 msgid "Seller Costs"
-msgstr ""
+msgstr "Coûts des vendeurs"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "Ordre d'achat"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_all_objects_menu
 msgid "All objects"
-msgstr ""
+msgstr "Tous les objets"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2
 msgid "Buyer's auction for all months"
-msgstr ""
+msgstr "Ventes/Vendeurs de l'année en cours"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -335,7 +321,7 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "Envoyer un SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -345,31 +331,30 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,sel_inv_id:0
 msgid "Seller Invoice"
-msgstr ""
+msgstr "Facture du vendeur"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
-msgstr ""
+msgstr "Commissions"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr ""
+msgstr "Précédent"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
 msgid "Unsold objects"
-msgstr ""
+msgstr "Objets non vendus"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_sold1
 msgid "Sold Objects"
-msgstr ""
+msgstr "Objets vendus"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,35 +364,31 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
-msgstr ""
+msgstr "Ordre d'achat"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,lang:0
 msgid "Langage"
-msgstr ""
+msgstr "Langage"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
-msgstr ""
+msgstr "Objet"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "Associer un acheteur à un partenaire"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
 msgid "Inventory Number"
-msgstr ""
+msgstr "Numéro d'Inventaire"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,end:0
@@ -415,12 +396,12 @@ msgstr ""
 #: wizard_button:auction.lots.numerotate,search,end:0
 #: wizard_button:auction.lots.numerotate_cont,init,end:0
 msgid "Exit"
-msgstr ""
+msgstr "Quitter"
 
 #. module: auction
 #: field:report.buyer.auction2,net_revenue:0
 msgid "Net Revenue"
-msgstr ""
+msgstr "Revenu net"
 
 #. module: auction
 #: view:report.buyer.auction:0
@@ -428,67 +409,64 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
-msgstr ""
+msgstr "État"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_sms
 msgid "SMS Send"
-msgstr ""
+msgstr "Envoi SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Cartoons"
-msgstr ""
+msgstr "Antiquités/Bandes Dessinées"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
-msgstr ""
+msgstr "Vendu"
 
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: auction
 #: field:auction.bid_line,name:0
 msgid "Bid date"
-msgstr ""
+msgstr "Date de l'ordre d'achat"
 
 #. module: auction
 #: field:auction.dates,acc_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Comptes des dépenses"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr ""
+msgstr "Gestion des livraisons"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
 msgid "Object Description"
-msgstr ""
+msgstr "Description de l'objet"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Contact the Seller"
-msgstr ""
+msgstr "Contacter le Vendeur"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Auction Objects"
-msgstr ""
+msgstr "Objets aux enchères"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -496,7 +474,7 @@ msgstr ""
 #: field:report.object.encoded.manager,gross_revenue:0
 #: field:report.seller.auction2,gross_revenue:0
 msgid "Gross revenue"
-msgstr ""
+msgstr "Revenu brut"
 
 #. module: auction
 #: view:report.seller.auction2:0
@@ -506,7 +484,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "Payer les objets de l'acheteur"
 
 #. module: auction
 #: view:report.deposit.border:0
@@ -516,7 +494,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer information"
-msgstr ""
+msgstr "Information sur l'Acheteur"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction
@@ -526,7 +504,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "Courte description (2)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_dates
@@ -534,22 +512,21 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "Acheteurs"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,amount:0
 #: wizard_field:auction.pay.buy,init,amount2:0
 #: wizard_field:auction.pay.buy,init,amount3:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Montant payé"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "Mes derniers Dépôts"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -558,17 +535,17 @@ msgstr ""
 #: field:report.auction.view,min_est:0
 #: field:report.unclassified.objects,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "Estimation Minimum"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Accounting"
-msgstr ""
+msgstr "Comptabilité"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2
 msgid "Buyer's Revenues"
-msgstr ""
+msgstr "Chiffre d'affaires de l'acheteur"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_adjudication
@@ -578,7 +555,7 @@ msgstr ""
 #. module: auction
 #: field:auction.bid_line,price:0
 msgid "Maximum Price"
-msgstr ""
+msgstr "Prix maximum"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -593,17 +570,17 @@ msgstr ""
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Envoi de SMS Par Lots"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "Sélectionnez les lots qui sont vendus"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
 msgid "Payment"
-msgstr ""
+msgstr "Paiement"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -613,12 +590,12 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Old weapons and militaria"
-msgstr ""
+msgstr "Antiquités/Armes anciennes et militaria"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts/Chineese furnitures"
-msgstr ""
+msgstr "Antiquités/Art Oriental/Meubles Chinois"
 
 #. module: auction
 #: selection:auction.deposit,method:0
@@ -630,13 +607,13 @@ msgstr ""
 #: wizard_button:auction.lots.send.aie,init,date_ask:0
 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuer"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
 #: field:report.object.encoded.manager,obj_num:0
 msgid "# of Encoded obj."
-msgstr ""
+msgstr "# d'Objets Encodés"
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
@@ -646,17 +623,17 @@ msgstr ""
 #. module: auction
 #: field:report.deposit.border,moy_est:0
 msgid "Avg. Est"
-msgstr ""
+msgstr "Est. Moy."
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of sellers:"
-msgstr ""
+msgstr "# de vendeurs"
 
 #. module: auction
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur: code EAN invalide"
 
 #. module: auction
 #: model:ir.module.module,description:auction.module_meta_information
@@ -676,12 +653,12 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1
 msgid "Auction's Summary"
-msgstr ""
+msgstr "Résumé de l'enchère"
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "%)"
-msgstr ""
+msgstr "%)"
 
 #. module: auction
 #: wizard_view:auction.lots.able,init:0
@@ -695,7 +672,7 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0
 #: field:report.deposit.border,nb_obj:0
 msgid "# of objects"
-msgstr ""
+msgstr "# d'objets"
 
 #. module: auction
 #: field:auction.lots,lot_est2:0
@@ -704,12 +681,12 @@ msgstr ""
 #: field:report.auction.view,max_est:0
 #: field:report.unclassified.objects,lot_est2:0
 msgid "Maximum Estimation"
-msgstr ""
+msgstr "Estimation Maximum"
 
 #. module: auction
 #: field:auction.lots,buyer_price:0
 msgid "Buyer price"
-msgstr ""
+msgstr "Prix de l'acheteur"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel
@@ -719,17 +696,17 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_form_id
 msgid "Seller List"
-msgstr ""
+msgstr "Listes des vendeurs"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
 msgid "Buyer's payment"
-msgstr ""
+msgstr "Paiement de l'acheteur"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Close + Create all invoices"
-msgstr ""
+msgstr "Fermer et créer les factures"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_catalog_flagy
@@ -739,7 +716,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lot.history,price:0
 msgid "Withdrawn price"
-msgstr ""
+msgstr "Prix de retrait"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
@@ -749,38 +726,37 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Verreries"
-msgstr ""
+msgstr "Antiquités/Verreries"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Toys"
-msgstr ""
+msgstr "Antiquités/Jouets"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "créé par"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Buyer form"
-msgstr ""
+msgstr "Formulaire de l'Acheteur"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Estimate"
-msgstr ""
+msgstr "Estimez"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of buyers:"
-msgstr ""
+msgstr "# d'acheteurs"
 
 #. module: auction
 #: field:auction.lots,costs:0
 msgid "Indirect costs"
-msgstr ""
+msgstr "Coûts indirects"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -790,17 +766,17 @@ msgstr ""
 #. module: auction
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer des comptes récursifs."
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_menu_root
 msgid "Auction Management"
-msgstr ""
+msgstr "Gestion des enchères"
 
 #. module: auction
 #: field:auction.dates,journal_seller_id:0
 msgid "Seller Journal"
-msgstr ""
+msgstr "Journal du vendeur"
 
 #. module: auction
 #: view:report.buyer.auction:0
@@ -810,60 +786,60 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_artist
 msgid "Define Artists"
-msgstr ""
+msgstr "Ajouter un artiste"
 
 #. module: auction
 #: field:auction.lot.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nom de la catégorie"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager
 #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member
 msgid "Comparison of estimations"
-msgstr ""
+msgstr "Comparaison des estimations"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
 msgid "Code barres du lot"
-msgstr ""
+msgstr "Code barres du lot"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,not_exist,init:0
 msgid "Retry"
-msgstr ""
+msgstr "Réessayez"
 
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Birth / Death dates"
-msgstr ""
+msgstr "Dates naissance/décès"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Jewelry"
-msgstr ""
+msgstr "Antiquités/Joaillerie"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_unclassified_objects
 msgid "Unclassified objects "
-msgstr ""
+msgstr "Objets Non Classés "
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate_cont,init,set_number:0
 #: wizard_field:auction.lots.send.aie,date_ask,numerotation:0
 #: wizard_field:auction.lots.send.aie,init,numerotation:0
 msgid "Numerotation"
-msgstr ""
+msgstr "Numérotation"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
 msgid "Bordereau de dépôt"
-msgstr ""
+msgstr "Bordereau de dépôt"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Document type"
-msgstr ""
+msgstr "Type de  document"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_estimation_adj_category
@@ -873,7 +849,7 @@ msgstr ""
 #. module: auction
 #: rml:buyer.list:0
 msgid "Adj(EUR)"
-msgstr ""
+msgstr "Adj (EUR)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -886,35 +862,34 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_object_cat
 msgid "Object Categories"
-msgstr ""
+msgstr "Catégories des objets"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,img_send:0
 msgid "Send Image also ?"
-msgstr ""
+msgstr "Envoyer l'image aussi ?"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Informations"
-msgstr ""
+msgstr "Informations générales"
 
 #. module: auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: auction
 #: view:report.auction.view:0
 msgid "Auctions results"
-msgstr ""
+msgstr "Résultats de l'Enchère"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,app_id:0
@@ -922,20 +897,19 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
-msgstr ""
+msgstr "ID de l'ordre d'achat"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Min Estimate:"
-msgstr ""
+msgstr "Estimation Min."
 
 #. module: auction
 #: field:report.buyer.auction2,net_margin:0
 msgid "Net Margin"
-msgstr ""
+msgstr "Marge Nette"
 
 #. module: auction
 #: field:auction.lots,vnd_lim_net:0
@@ -945,112 +919,107 @@ msgstr ""
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of commissions:"
-msgstr ""
+msgstr "# de commissions :"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_unclassified_objects
 #: model:ir.ui.menu,name:auction.menu_all_objects_unclassified
 #: view:report.unclassified.objects:0
 msgid "Unclassified objects"
-msgstr ""
+msgstr "Objets inclassifiés"
 
 #. module: auction
 #: wizard_view:auction.lots.make_invoice_buyer,init:0
 msgid "(Keep empty for automatic number)"
-msgstr ""
+msgstr "(Laisser vide pour une numérotation automatique)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
 #: view:report.auction.object.date:0
 msgid "Objects per day"
-msgstr ""
+msgstr "Objets par jour"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
 msgid "Oeuvres a 21%"
-msgstr ""
+msgstr "Oeuvres à 21%"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Carpet and textilles"
-msgstr ""
+msgstr "Antiquités/Tapis et Textiles"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
-msgstr ""
+msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: auction
 #: field:auction.lots,obj_ret:0
 msgid "Price retired"
-msgstr ""
+msgstr "Prix de retrait"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Extra Costs"
-msgstr ""
+msgstr "Coûts Additionnels"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_new
 msgid "New Auction Dates"
-msgstr ""
+msgstr "Nouvelle vente"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
 msgid "Seller Paid"
-msgstr ""
+msgstr "Payé pour le vendeur"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
 msgid "Deposit date"
-msgstr ""
+msgstr "Date de dépôt"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.id_deposit
 msgid "Deposits"
-msgstr ""
+msgstr "Dépots"
 
 #. module: auction
 #: field:auction.deposit,specific_cost_ids:0
 msgid "Specific Costs"
-msgstr ""
+msgstr "Coûts spécifiques"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
-msgstr ""
+msgstr "Enchères"
 
 #. module: auction
 #: field:report.seller.auction,object_number:0
 msgid "No of Objects"
-msgstr ""
+msgstr "Nombre d'Objets"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: auction
 #: field:auction.lot.category,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorité"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
@@ -1060,16 +1029,15 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Painting"
-msgstr ""
+msgstr "Antiquités/Tableaux"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Aie Category"
-msgstr ""
+msgstr "Aie catégorie"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1089,22 +1057,22 @@ msgstr ""
 #: wizard_button:auction.pay.buy,init,end:0
 #: wizard_button:auction.payer.sel,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Beginning of the auction"
-msgstr ""
+msgstr "Début de la vente"
 
 #. module: auction
 #: field:auction.artists,biography:0
 msgid "Biography"
-msgstr ""
+msgstr "Biographie"
 
 #. module: auction
 #: field:auction.lots,lot_local:0
 msgid "Location"
-msgstr ""
+msgstr "Emplacement"
 
 #. module: auction
 #: wizard_view:auction.payer.sel,init:0
@@ -1114,129 +1082,124 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.act_window,name:auction.view_report_object_by_auction
 msgid "Detailed lots"
-msgstr ""
+msgstr "Lots détaillés"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "Statistiques des Objets"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Analytic"
-msgstr ""
+msgstr "Analytique"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_results
 msgid "Send results to Auction-in-europe.com"
-msgstr ""
+msgstr "Envoi des résultats vers Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Decrease limit of 10%"
-msgstr ""
+msgstr "Diminuer la limite de 10 %"
 
 #. module: auction
 #: field:auction.dates,adj_total:0
 #: field:report.auction.adjudication,adj_total:0
 #: field:report.auction.estimation.adj.category,adj_total:0
 msgid "Total Adjudication"
-msgstr ""
+msgstr "Adjudication totale"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_reporting1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all1
 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all2
 msgid "Seller's auction"
-msgstr ""
+msgstr "Ventes/Vendeurs"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1
 msgid "Invoice Buyer objects"
-msgstr ""
+msgstr "Facturer les objets de l'acheteur"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2
 msgid "Seller's Revenues"
-msgstr ""
+msgstr "Chiffre d'affaires des vendeurs"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Price"
-msgstr ""
+msgstr "Prix"
 
 #. module: auction
 #: rml:bids.phones.details:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
-msgstr ""
+msgstr "Sous-total :"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Photos"
-msgstr ""
+msgstr "Photos"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,number:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Numéro de facture"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view1
 msgid "Buyer's Summary"
-msgstr ""
+msgstr "Résumé des acheteurs"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Référence Client"
 
 #. module: auction
 #: rml:bids.lots:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
 msgid "Depositer Inventory"
-msgstr ""
+msgstr "Inventaire de dépôt"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_m
 #: model:ir.ui.menu,name:auction.menu_report_deposit_tree_member
 msgid "Depositer's Statistics"
-msgstr ""
+msgstr "Statistiques du dépositaire"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
 msgid "Total adj."
-msgstr ""
+msgstr "Adj. Totale"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,uname:0
@@ -1245,13 +1208,12 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,init,uname:0
 #: wizard_field:auction.lots.sms_send,init,user:0
 msgid "Login"
-msgstr ""
+msgstr "Connexion"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
-msgstr ""
+msgstr "À Payer"
 
 #. module: auction
 #: wizard_button:auction.lots.enable,init,go:0
@@ -1261,23 +1223,22 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Others"
-msgstr ""
+msgstr "Antiquités/Autres"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.seller_lots_3
 msgid "Seller Form"
-msgstr ""
+msgstr "Formulaire du Vendeur"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
-msgstr ""
+msgstr "Catégorie de l'objet"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Mark Lots"
-msgstr ""
+msgstr "Marquer les Lots"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
@@ -1285,7 +1246,7 @@ msgstr ""
 #: wizard_field:auction.lots.numerotate,search,obj_num:0
 #: field:report.unclassified.objects,obj_num:0
 msgid "Catalog Number"
-msgstr ""
+msgstr "N° du catalogue"
 
 #. module: auction
 #: view:report.auction.view2:0
@@ -1300,12 +1261,12 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.bid_phone
 msgid "Bids phones"
-msgstr ""
+msgstr "Téléphone: Ordre d'achat"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_by_auction
 msgid "Auction dates"
-msgstr ""
+msgstr "Dates de l'enchère"
 
 #. module: auction
 #: view:report.seller.auction2:0
@@ -1315,7 +1276,7 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree
 msgid "Encoded Objects Per Day"
-msgstr ""
+msgstr "Objets encodés par jour"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_buyer_auction
@@ -1326,38 +1287,37 @@ msgstr ""
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Debit:"
-msgstr ""
+msgstr "Débit :"
 
 #. module: auction
 #: field:auction.lots,author_right:0
 msgid "Author rights"
-msgstr ""
+msgstr "Droit d'auteurs"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Payment's history"
-msgstr ""
+msgstr "Historique du paiement"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid ", TEL:"
-msgstr ""
+msgstr ", TEL:"
 
 #. module: auction
 #: view:report.auction.view:0
 msgid "Auction results"
-msgstr ""
+msgstr "Résultats de l'Enchère"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view2
 msgid "Auction's Revenues"
-msgstr ""
+msgstr "Les revenus de la vente aux enchères"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
@@ -1367,14 +1327,14 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,set_buyer:0
 msgid "Update"
-msgstr ""
+msgstr "Mettre à jour"
 
 #. module: auction
 #: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_seller_menu
 #: model:ir.ui.menu,name:auction.auction_seller_menu
 msgid "Sellers"
-msgstr ""
+msgstr "Vendeurs"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1384,7 +1344,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
 msgid "Results with buyer"
-msgstr ""
+msgstr "Résultats des acheteurs"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -1394,17 +1354,17 @@ msgstr ""
 #. module: auction
 #: wizard_button:auction.lots.auction_move,init,set_date:0
 msgid "Move to Auction date"
-msgstr ""
+msgstr "Déplacer à la date de l'Enchère"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_dates_old
 msgid "Old Auctions"
-msgstr ""
+msgstr "Anciennes ventes"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of unsold items:"
-msgstr ""
+msgstr "@ d'articles non vendus"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1412,20 +1372,19 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
 #: wizard_field:auction.lots.send.aie.results,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie.results,init,dates:0
 msgid "Auction Date"
-msgstr ""
+msgstr "Date de l'enchère"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
 msgid ", ID"
-msgstr ""
+msgstr ", ID"
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
@@ -1435,25 +1394,25 @@ msgstr ""
 #. module: auction
 #: field:auction.bid_line,auction:0
 msgid "Auction Name"
-msgstr ""
+msgstr "Nom de l'Enchère"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_manager_tree1
 #: model:ir.ui.menu,name:auction.menu_report_auction_sign_in_out_member_tree1
 msgid "Attendance"
-msgstr ""
+msgstr "Présence"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller information"
-msgstr ""
+msgstr "Information sur le vendeur"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
 #: wizard_field:auction.lots.buyer_map,check,ach_login:0
 #: field:report.unclassified.objects,ach_login:0
 msgid "Buyer Username"
-msgstr ""
+msgstr "Nom de l'acheteur"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1461,26 +1420,24 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
-msgstr ""
+msgstr "Inventaire"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_dates_next
 msgid "Next Auctions"
-msgstr ""
+msgstr "Prochaines ventes"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. module: auction
 #: field:auction.lots,ach_emp:0
 msgid "Taken Away"
-msgstr ""
+msgstr "Emporté"
 
 #. module: auction
 #: view:report.object.encoded.manager:0
@@ -1490,22 +1447,22 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Miniatures / Collections"
-msgstr ""
+msgstr "Antiquités/Figurines / Collections"
 
 #. module: auction
 #: wizard_view:auction.lots.numerotate,not_exist:0
 msgid "This lot does not exist !"
-msgstr ""
+msgstr "Ce lot n'existe pas !"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "End of auction"
-msgstr ""
+msgstr "Fin de la vente"
 
 #. module: auction
 #: field:auction.bid_line,call:0
 msgid "To be Called"
-msgstr ""
+msgstr "A appeler"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction_estimation_adj_category_manager_tree
@@ -1517,7 +1474,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
 msgid "Lots List - Landscape"
-msgstr ""
+msgstr "Liste des lots - Paysage"
 
 #. module: auction
 #: view:report.seller.auction:0
@@ -1528,7 +1485,7 @@ msgstr ""
 #: wizard_view:auction.lots.auction_move,init:0
 #: model:ir.actions.wizard,name:auction.wizard_change_auction
 msgid "Change Auction Date"
-msgstr ""
+msgstr "Changer la date de l'enchère"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1538,12 +1495,12 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit,method:0
 msgid "Withdrawned method"
-msgstr ""
+msgstr "Méthode de retrait"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Max Estimate:"
-msgstr ""
+msgstr "Estimation Max :"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_bid
@@ -1553,12 +1510,12 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view2,obj_margin:0
 msgid "Avg margin"
-msgstr ""
+msgstr "Moy de la marge"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Art from the Ivory Coast"
-msgstr ""
+msgstr "Antiquités/Art de la Côte d'Ivoire"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1569,23 +1526,25 @@ msgstr ""
 #: wizard_button:auction.lots.make_invoice,init,invoice:0
 #: wizard_button:auction.lots.make_invoice_buyer,init,invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Créer les factures"
 
 #. module: auction
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
+"catégorie."
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_unplanned1
 msgid "Unplanned objects"
-msgstr ""
+msgstr "Objets non plannifiés"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1600,37 +1559,35 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,journal_id:0
 msgid "Buyer Journal"
-msgstr ""
+msgstr "Journal de l'acheteur"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
-msgstr ""
+msgstr "Payé"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
-msgstr ""
+msgstr "Téléphone"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Argenterie"
-msgstr ""
+msgstr "Antiquités/Argenterie"
 
 #. module: auction
 #: wizard_button:auction.pay.buy,init,pay:0
 #: wizard_button:auction.payer.sel,init,pay2:0
 msgid "Pay"
-msgstr ""
+msgstr "Payer"
 
 #. module: auction
 #: field:auction.lot.category,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1640,15 +1597,13 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Sculpture, bronze, eso."
-msgstr ""
+msgstr "Antiquiés/Sculpture, bronze, etc, ..."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
-msgstr ""
+msgstr "Total :"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax2
@@ -1658,28 +1613,28 @@ msgstr ""
 #. module: auction
 #: view:report.auction.object.date:0
 msgid "Objects per Day"
-msgstr ""
+msgstr "Objets par Jour"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Document Number"
-msgstr ""
+msgstr "Numéro du Document"
 
 #. module: auction
 #: field:report.object.encoded.manager,obj_margin:0
 #: field:report.seller.auction2,net_margin:0
 msgid "Net margin"
-msgstr ""
+msgstr "Marge Nette"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,set_number:0
 msgid "Numerotate"
-msgstr ""
+msgstr "Numéroter"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Buyer, Price"
-msgstr ""
+msgstr "Prix de l'Acheteur"
 
 #. module: auction
 #: rml:auction.code_bar_lot:0
@@ -1694,12 +1649,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,vnd_lim:0
 msgid "Seller limit"
-msgstr ""
+msgstr "Limite du vendeur"
 
 #. module: auction
 #: wizard_view:auction.lots.buyer_map,done:0
 msgid "All objects are assigned to buyers !"
-msgstr ""
+msgstr "Tous les objets sont assignés aux acheteurs !"
 
 #. module: auction
 #: wizard_button:auction.lots.able,init,go:0
@@ -1711,6 +1666,8 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: auction
 #: field:auction.deposit,transfer:0
@@ -1726,12 +1683,12 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author 2"
-msgstr ""
+msgstr "Artiste/Auteur 2"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view1
 msgid "Seller's Summary"
-msgstr ""
+msgstr "Résumé du vendeur"
 
 #. module: auction
 #: view:report.seller.auction:0
@@ -1741,7 +1698,7 @@ msgstr ""
 #. module: auction
 #: wizard_field:auction.taken,init,lot_ids:0
 msgid "Lots Emportes"
-msgstr ""
+msgstr "Lots emportés"
 
 #. module: auction
 #: wizard_button:auction.lots.send.aie,date_ask,send:0
@@ -1752,22 +1709,22 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,net_margin:0
 msgid "Net Margin (%)"
-msgstr ""
+msgstr "Marge nette (%)"
 
 #. module: auction
 #: field:report.auction.object.date,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.auction_lots_open
 msgid "Simplified lots for adjudication"
-msgstr ""
+msgstr "Lots simplifiés"
 
 #. module: auction
 #: field:auction.lots,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_view
@@ -1782,7 +1739,7 @@ msgstr ""
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Porcelain, Ceramics, Glassmaking, ..."
-msgstr ""
+msgstr "Antiquités/Porcelaine, Céramiques, Verrerie, ..."
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -1790,37 +1747,33 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
-msgstr ""
+msgstr "Objets"
 
 #. module: auction
 #: wizard_view:auction.lots.numerotate,init:0
 #: wizard_view:auction.lots.numerotate,search:0
 msgid "Object Reference"
-msgstr ""
+msgstr "Référence de l'Objet"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Paid:"
-msgstr ""
+msgstr "Payé :"
 
 #. module: auction
 #: field:auction.deposit,total_neg:0
 msgid "Allow Negative Amount"
-msgstr ""
+msgstr "Permettre un montant négatif"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
-msgstr ""
+msgstr "Ventes aux enchères"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -1828,30 +1781,25 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
-msgstr ""
+msgstr "Date de l'enchère"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_unsold
 msgid "Unsold Objects"
-msgstr ""
+msgstr "Objets non vendus"
 
 #. module: auction
 #: field:report.buyer.auction,avg_price:0
 msgid "Avg Adj."
-msgstr ""
+msgstr "Moy Adj"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit_cost
@@ -1861,17 +1809,17 @@ msgstr ""
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,bord_vnd_id:0
 msgid "Object Inventory"
-msgstr ""
+msgstr "Inventaire des Objets"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Art from the Ivory Coast/African Arts"
-msgstr ""
+msgstr "Antiquités/Art de la Côte d'Ivoire/Art Africain"
 
 #. module: auction
 #: field:auction.dates,auction1:0
 msgid "First Auction Day"
-msgstr ""
+msgstr "Début de l'enchère"
 
 #. module: auction
 #: view:report.attendance:0
@@ -1881,33 +1829,33 @@ msgstr ""
 #. module: auction
 #: view:auction.lot.category:0
 msgid "Lot Category"
-msgstr ""
+msgstr "Catégorie du lot"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_manager_menu
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Names"
-msgstr ""
+msgstr "Noms"
 
 #. module: auction
 #: view:auction.artists:0
 msgid "Artists"
-msgstr ""
+msgstr "Artistes"
 
 #. module: auction
 #: field:report.attendance,total_attendance:0
 #: xsl:report.auction.ach_bordereau:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
 msgid "Open lots"
-msgstr ""
+msgstr "Lots ouverts"
 
 #. module: auction
 #: view:report.seller.auction:0
@@ -1917,22 +1865,22 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Lots"
-msgstr ""
+msgstr "Lots"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_send
 msgid "Send to website"
-msgstr ""
+msgstr "Envoi vers le site web"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_old
 msgid "Old Auction Dates"
-msgstr ""
+msgstr "Anciennes ventes"
 
 #. module: auction
 #: field:auction.lots,seller_price:0
 msgid "Seller price"
-msgstr ""
+msgstr "Prix du vendeur"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction2
@@ -1942,7 +1890,7 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buy_id_list
 msgid "Buyer List"
-msgstr ""
+msgstr "Liste des Acheteurs"
 
 #. module: auction
 #: rml:buyer.list:0
@@ -1954,12 +1902,12 @@ msgstr ""
 #: wizard_field:auction.pay.buy,init,statement_id2:0
 #: wizard_field:auction.pay.buy,init,statement_id3:0
 msgid "Statement"
-msgstr ""
+msgstr "Déclaration"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Engravings"
-msgstr ""
+msgstr "Antiquités/Gravures"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
@@ -1971,7 +1919,7 @@ msgstr ""
 #: wizard_view:auction.lots.numerotate_cont,init:0
 #: wizard_field:auction.lots.numerotate_cont,init,number:0
 msgid "First Number"
-msgstr ""
+msgstr "Premier Numéro"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax
@@ -1986,18 +1934,17 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,expo1:0
 msgid "First Exposition Day"
-msgstr ""
+msgstr "Premier jour de l'exposition"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
-msgstr ""
+msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !"
 
 #. module: auction
 #: field:report.auction.object.date,name:0
 msgid "Created date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: auction
 #: view:auction.bid:0
@@ -2007,120 +1954,116 @@ msgstr ""
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "TEL:"
-msgstr ""
+msgstr "TÉL :"
 
 #. module: auction
 #: field:auction.dates,acc_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Compte des entrées"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
-msgstr ""
+msgstr "Revenu net"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
-msgstr ""
+msgstr "Limite"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree_manager
 msgid "Latest Deposits"
-msgstr ""
+msgstr "Derniers dépôts"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of items:"
-msgstr ""
+msgstr "# d'articles :"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Musical Instruments"
-msgstr ""
+msgstr "Antiquités/Instruments de Musique"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
 #: field:report.object.encoded.manager,estimation:0
 msgid "Estimation"
-msgstr ""
+msgstr "Estimation"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Graphic Arts"
-msgstr ""
+msgstr "Antiquités/Arts Graphiques"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buyer_form_id
 msgid "Buyer Form"
-msgstr ""
+msgstr "Fiche du acheteur"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_invoice
 msgid "Invoice Seller objects"
-msgstr ""
+msgstr "Facturer les objets du vendeur"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts"
-msgstr ""
+msgstr "Antiquiés/Arts Orientaux"
 
 #. module: auction
 #: field:auction.bid,partner_id:0
 msgid "Buyer Name"
-msgstr ""
+msgstr "Nom de l'acheteur"
 
 #. module: auction
 #: field:report.auction.view2,sum_adj:0
 msgid "Sum of adjudication"
-msgstr ""
+msgstr "somme de l'adjudication"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_enable_taken
 msgid "Unmark as taken away"
-msgstr ""
+msgstr "Marquer comme non emporté"
 
 #. module: auction
 #: field:auction.lots,gross_margin:0
 msgid "Gross Margin (%)"
-msgstr ""
+msgstr "Marge brute (%)"
 
 #. module: auction
 #: selection:auction.dates,state:0
 #: selection:report.auction.adjudication,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Fermé"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
-msgstr ""
+msgstr "Commission"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,init,lot_num:0
 msgid "Lot Number"
-msgstr ""
+msgstr "Numéro de Lot"
 
 #. module: auction
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Le numéro de TVA ne semble pas correct."
 
 #. module: auction
 #: field:report.attendance,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Employé"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
-msgstr ""
+msgstr "Adj. (EUR)"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
@@ -2130,17 +2073,17 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr ""
+msgstr "Reporting"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Catalog"
-msgstr ""
+msgstr "Catalogue"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
 msgid "Destination Account"
-msgstr ""
+msgstr "Compte de destination"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_deposit_border
@@ -2150,29 +2093,29 @@ msgstr ""
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_config_menu
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_outils_menu
 msgid "Tools Bar Codes"
-msgstr ""
+msgstr "Outils de codes à barres"
 
 #. module: auction
 #: field:auction.deposit.cost,deposit_id:0
 msgid "Deposit"
-msgstr ""
+msgstr "Dépôt"
 
 #. module: auction
 #: field:auction.dates,expo2:0
 msgid "Last Exposition Day"
-msgstr ""
+msgstr "Dernier jour d'exposition"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view1
 #: model:ir.actions.act_window,name:auction.action_auction_report_allmonth_view2
 #: model:ir.actions.act_window,name:auction.action_auction_report_thismonth_view2
 msgid "Auction report"
-msgstr ""
+msgstr "Rapport de l'auction"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_category
@@ -2182,23 +2125,22 @@ msgstr ""
 #. module: auction
 #: field:auction.artists,name:0
 msgid "Artist/Author Name"
-msgstr ""
+msgstr "Nom Artiste/Auteur"
 
 #. module: auction
 #: field:auction.lots,image:0
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: auction
 #: selection:report.object.encoded,state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturé"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
-msgstr ""
+msgstr "Emporté"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -2215,7 +2157,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting2
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all1
 msgid "Buyer's auction"
-msgstr ""
+msgstr "Ventes/Vendeurs"
 
 #. module: auction
 #: view:report.seller.auction2:0
@@ -2225,27 +2167,27 @@ msgstr ""
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Costs"
-msgstr ""
+msgstr "Coûts du dépot"
 
 #. module: auction
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: auction
 #: rml:buyer.list:0
 msgid "........."
-msgstr ""
+msgstr "........."
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
@@ -2260,23 +2202,22 @@ msgstr ""
 #. module: auction
 #: rml:report.auction.buyer.result:0
 msgid "Adj"
-msgstr ""
+msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
-msgstr ""
+msgstr "Dates des ventes aux enchères"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Furnitures"
-msgstr ""
+msgstr "Antiquiés/Meubles"
 
 #. module: auction
 #: xsl:report.auction.ach_bordereau:0
 msgid "Customer Contact"
-msgstr ""
+msgstr "Contact Client"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
@@ -2290,22 +2231,22 @@ msgstr ""
 #: field:report.object.encoded,user_id:0
 #: field:report.object.encoded.manager,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: auction
 #: view:report.unplanned.object:0
 msgid "Unplanned Objects"
-msgstr ""
+msgstr "Objets Non Prévus"
 
 #. module: auction
 #: field:report.buyer.auction2,gross_revenue:0
 msgid "Gross Revenue"
-msgstr ""
+msgstr "Revenu brut"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
 msgid "Pseudo"
-msgstr ""
+msgstr "Surnom"
 
 #. module: auction
 #: field:auction.lots,important:0
@@ -2315,43 +2256,43 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Not sold"
-msgstr ""
+msgstr "Non Vendu"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax3
 #: field:auction.dates,buyer_costs:0
 msgid "Buyer Costs"
-msgstr ""
+msgstr "Coût de l'acheteur"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_automatic
 msgid "Numerotation (automatic)"
-msgstr ""
+msgstr "Numérotation automatique"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Auction Date:"
-msgstr ""
+msgstr "Date de l'Enchère :"
 
 #. module: auction
 #: field:auction.lots,ach_inv_id:0
 msgid "Buyer Invoice"
-msgstr ""
+msgstr "Facture de l'acheteur"
 
 #. module: auction
 #: rml:auction.bids:0
 msgid "Tel"
-msgstr ""
+msgstr "Tél"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,total:0
 msgid "Amount to paid"
-msgstr ""
+msgstr "Montant à payer"
 
 #. module: auction
 #: field:auction.lots,artist_id:0
 msgid "Artist/Author"
-msgstr ""
+msgstr "Artiste/Auteur"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
@@ -2361,12 +2302,12 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.total_result1
 msgid "Auction Totals with lists"
-msgstr ""
+msgstr "Totaux de la vente"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,done,end:0
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_object_encoded
@@ -2382,27 +2323,27 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view,nbuyer:0
 msgid "No of buyers"
-msgstr ""
+msgstr "Nb d'acheteurs"
 
 #. module: auction
 #: field:report.seller.auction,avg_price:0
 msgid "Avg adjudication"
-msgstr ""
+msgstr "Adjudication Moy."
 
 #. module: auction
 #: view:report.object.encoded.manager:0
 msgid "Object statistic"
-msgstr ""
+msgstr "Statistique de l'Objet"
 
 #. module: auction
 #: field:auction.dates,auction2:0
 msgid "Last Auction Day"
-msgstr ""
+msgstr "Fin de l'enchère"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next1
 msgid "Next Auction Dates"
-msgstr ""
+msgstr "Prochaines ventes"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_attendance
@@ -2410,18 +2351,13 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -2429,21 +2365,20 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
-msgstr ""
+msgstr "Prix d'adjudication"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_to_sell
 msgid "Objects to sell"
-msgstr ""
+msgstr "Objets à vendre"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Ref."
-msgstr ""
+msgstr "Réf."
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,password:0
@@ -2452,34 +2387,34 @@ msgstr ""
 #: wizard_field:auction.lots.send.aie.results,init,password:0
 #: wizard_field:auction.lots.sms_send,init,password:0
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #. module: auction
 #: field:auction.lots,ach_avance:0
 msgid "Buyer Advance"
-msgstr ""
+msgstr "Avance de l'acheteur"
 
 #. module: auction
 #: field:auction.lots,name:0
 #: wizard_field:auction.lots.numerotate,search,name:0
 #: field:report.unclassified.objects,name:0
 msgid "Short Description"
-msgstr ""
+msgstr "Courte description"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_employees_menu
 msgid "Employees"
-msgstr ""
+msgstr "Employés"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Clocks and watches"
-msgstr ""
+msgstr "Antiquités/Horloges et Montres"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Scientific Instruments"
-msgstr ""
+msgstr "Antiquités/Instruments Scientifiques"
 
 #. module: auction
 #: wizard_view:auction.lots.enable,init:0
@@ -2489,71 +2424,155 @@ msgstr ""
 #. module: auction
 #: wizard_view:auction.pay.buy,init:0
 msgid "Pay objects"
-msgstr ""
+msgstr "Payer les Objets"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
-msgstr ""
+msgstr "# d'objets"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Adjudication:"
-msgstr ""
+msgstr "Adjudication :"
 
 #. module: auction
 #: field:report.buyer.auction2,sumadj:0
 msgid "Sum of adjustication"
-msgstr ""
+msgstr "Somme de l'adjudication"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.details_bids_phones
 msgid "Bids per lot (phone)"
-msgstr ""
+msgstr "Ordre d'achat par lot(tél)"
 
 #. module: auction
 #: field:report.buyer.auction,buyer_login:0
 #: field:report.buyer.auction2,buyer_login:0
 msgid "Buyer Login"
-msgstr ""
+msgstr "Login de l'acheteur"
 
 #. module: auction
 #: field:auction.deposit,tax_id:0
 msgid "Expenses"
-msgstr ""
+msgstr "Dépenses"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Wine"
-msgstr ""
+msgstr "Antiquités/Vins"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Auction name:"
-msgstr ""
+msgstr "Nom d' l'Enchère :"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/African Arts"
-msgstr ""
+msgstr "Antiquités/Art Africain"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.art2
 msgid "Artists Biography"
-msgstr ""
+msgstr "Biographie de l'auteur"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Posters"
-msgstr ""
+msgstr "Antiquités/Affiches"
 
 #. module: auction
 #: field:auction.lots,history_ids:0
 msgid "Auction history"
-msgstr ""
+msgstr "Historique de la vente"
 
 #. module: auction
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
+msgstr "Commandes"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
 msgstr ""
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index f6197975158..aa15b904881 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 070b08c545d..f14e5a4d156 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Imposta a Bozza"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Venditore"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Acquirente"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Nr. di oggetti"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Numero Lista"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Arte Contemporanea"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Rif"
 
@@ -263,8 +252,7 @@ msgstr ""
 "(Entrata)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -274,8 +262,7 @@ msgid "Net margin (%)"
 msgstr "Margine netto (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -305,9 +292,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -330,8 +315,7 @@ msgid "Contact"
 msgstr "Contatto"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -372,8 +356,7 @@ msgid "Sold Objects"
 msgstr "Oggetti venduti"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -383,9 +366,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -396,10 +377,8 @@ msgid "Langage"
 msgstr "Lingua"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Oggetto"
 
@@ -432,11 +411,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Stato"
@@ -452,8 +429,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -462,8 +438,7 @@ msgstr "Venduto"
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
-"Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti"
+msgstr "Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti"
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -539,8 +514,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Compratori"
 
@@ -552,9 +526,9 @@ msgid "Amount paid"
 msgstr "Importo pagato"
 
 #. module: auction
-#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
+#: view:board.board:0
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "I Miei Depositi recenti"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -762,8 +736,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Creato da"
 
@@ -891,8 +864,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -927,8 +899,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -981,16 +952,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1031,14 +999,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1073,8 +1039,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1122,10 +1087,9 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "Statistiche Oggetto"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1138,8 +1102,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1183,8 +1146,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1200,8 +1162,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1224,8 +1185,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1253,8 +1213,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1274,8 +1233,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1344,8 +1302,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1417,8 +1374,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1466,8 +1422,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1477,8 +1432,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1610,16 +1564,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1650,10 +1602,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1799,8 +1749,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Oggetti"
@@ -1822,12 +1771,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1837,17 +1783,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1999,8 +1940,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2024,16 +1964,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2105,8 +2043,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2126,8 +2063,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2204,8 +2140,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2242,8 +2177,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2272,8 +2206,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2419,16 +2352,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2438,8 +2366,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2501,8 +2428,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2566,3 +2492,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Oggetto per Giorno"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Responsabile Asta"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Riepilogo collegato a Utente"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Membro Asta"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Responsabile Asta "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Stimato / Aggiudicato"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Totale Aggiudicazioni"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Oggetti recenti"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Depositi recenti"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menu"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "I Miei Oggetti per Giorno"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Il Mio Dashboard"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Dashboard Responsabile Asta"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Minimo / Aggiudicato / Massimo"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "I Miei Oggetti recenti"
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index 6f303578680..b018df885f3 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/i18n/ko.po
@@ -33,12 +33,9 @@ msgid "Set to draft"
 msgstr "드래프트로 설정"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "판매자"
 
@@ -91,23 +88,18 @@ msgid "Deposit Form"
 msgstr "적립 폼"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "구매자"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "오브젝트 번호"
 
@@ -132,8 +124,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -205,8 +196,7 @@ msgid "Objects by Auction"
 msgstr "옥션 별 오브젝트"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "리스트 번호"
 
@@ -241,8 +231,7 @@ msgid "Contemporary Art"
 msgstr "현대 미술"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "참조"
 
@@ -262,8 +251,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "총 조정"
 
@@ -273,8 +261,7 @@ msgid "Net margin (%)"
 msgstr "순 마진(%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -302,9 +289,7 @@ msgid "Seller Costs"
 msgstr "판매자 원가"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -327,8 +312,7 @@ msgid "Contact"
 msgstr "연락처"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -369,8 +353,7 @@ msgid "Sold Objects"
 msgstr "판매된 오브젝트"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "순 마진 합계"
 
@@ -380,9 +363,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "비드"
@@ -393,10 +374,8 @@ msgid "Langage"
 msgstr "언어"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "오브젝트"
 
@@ -429,11 +408,9 @@ msgid "Auction buyer reporting form view"
 msgstr "옥션 구매자 보고서 폼 뷰"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "상태"
@@ -449,8 +426,7 @@ msgid "Antique/Cartoons"
 msgstr "골동품/카툰"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -535,8 +511,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "구매자"
 
@@ -763,8 +738,7 @@ msgid "Antique/Toys"
 msgstr "골동품/장난감"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "작성자"
 
@@ -892,8 +866,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -928,8 +901,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -982,16 +954,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "골동품/카펫 및 섬유제품"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "날짜"
@@ -1032,14 +1001,12 @@ msgid "Specific Costs"
 msgstr "특정 원가"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "옥션"
 
@@ -1074,8 +1041,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "번호"
@@ -1123,8 +1089,7 @@ msgid "Detailed lots"
 msgstr "상세 LOTs"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "오브젝트 통계"
 
@@ -1139,8 +1104,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1184,8 +1148,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "소계:"
 
@@ -1201,8 +1164,7 @@ msgid "Invoice Number"
 msgstr "인보이스 번호"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1225,8 +1187,7 @@ msgid "Name"
 msgstr "이름"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1254,8 +1215,7 @@ msgid "Login"
 msgstr "로그인"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1275,8 +1235,7 @@ msgid "Seller Form"
 msgstr "판매자 폼"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "오브젝트 카테고리"
 
@@ -1345,8 +1304,7 @@ msgid "Payment's history"
 msgstr "결제 히스토리"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "문서"
 
@@ -1418,8 +1376,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1467,8 +1424,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "재고"
 
@@ -1478,8 +1434,7 @@ msgid "Next Auctions"
 msgstr "다음 옥션"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1609,16 +1564,14 @@ msgid "Buyer Journal"
 msgstr "구매자 저널"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "결제됨"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "전화"
 
@@ -1649,10 +1602,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "합계:"
 
@@ -1796,8 +1747,7 @@ msgid "Plate Number:"
 msgstr "플레이트 번호:"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "오브젝트"
@@ -1819,12 +1769,9 @@ msgid "Allow Negative Amount"
 msgstr "음수 금액을 허용함"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "옥션"
 
@@ -1834,17 +1781,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "옥션 날짜"
@@ -1996,8 +1938,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2021,16 +1962,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "순 수입"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "한계"
 
@@ -2102,8 +2041,7 @@ msgid "Closed"
 msgstr "마감됨"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "커미션"
 
@@ -2123,8 +2061,7 @@ msgid "Employee"
 msgstr "직원"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "조정 (유로)"
 
@@ -2201,8 +2138,7 @@ msgid "Invoiced"
 msgstr "인보이스됨"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2239,8 +2175,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "에러! 재귀적 관련 멤버를 만들 수는 없습니다."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2269,8 +2204,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "옥션 날짜"
 
@@ -2416,16 +2350,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2435,8 +2364,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2498,8 +2426,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2564,22 +2491,102 @@ msgstr ""
 msgid "Orders"
 msgstr ""
 
-#, python-format
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "일별 오브젝트"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "옥션 매니저"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "사용자별 포인팅 요약"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "옥션 멤버"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "옥션 멤버 위원회"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "옥션 매니저 "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "옥션 위원회"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "추정/조정"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "총 조정"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "최종 오브젝트"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "최종 적립"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "메뉴"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "일별 내 오브젝트"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "내 보드"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "옥션 매니저 위원회"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "최소/조정/최대"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "내 최종 오브젝트"
+
 #~ msgid "The Buyer \"%s\" has no Invoice Address."
 #~ msgstr "구매자 \"%s\"는 인보이스 주소가 없습니다."
 
-#, python-format
 #~ msgid "The object \"%s\" has no buyer assigned."
 #~ msgstr "오브젝트 \"%s\"는 할당된 구매자가 없습니다."
 
-#, python-format
 #~ msgid "No Invoice Address"
 #~ msgstr "인보이스 주소 없음"
 
-#, python-format
 #~ msgid "The Buyer has no Invoice Address."
 #~ msgstr "구매자의 인보이스 주소가 없습니다."
 
-#, python-format
 #~ msgid "Missed buyer !"
 #~ msgstr "누락된 구매자 !"
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index e06556e9460..2d01745cf8c 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 1316cced919..43fe5121a87 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Zet op concept"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Verkoper"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Stortingsformulier"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Koper"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Aantal kavels"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antiek/boeken, manuscripten, enz."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Betalingsgrens"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Kavels per veiling"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Lijstnummer"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Hedendaagse kunst"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref"
 
@@ -262,8 +251,7 @@ msgstr ""
 "Fout: Inklokken (resp uitklokken) moet volgen op uitklokken (resp. inklokken)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Totaal verkl."
 
@@ -273,8 +261,7 @@ msgid "Net margin (%)"
 msgstr "Netto marge (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -303,9 +290,7 @@ msgid "Seller Costs"
 msgstr "Kosten verkoper"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -328,8 +313,7 @@ msgid "Contact"
 msgstr "Contactpersoon"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "# kav. ret"
@@ -370,8 +354,7 @@ msgid "Sold Objects"
 msgstr "Verkochte kavels"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Som netto marge"
 
@@ -381,9 +364,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Bieden"
@@ -394,10 +375,8 @@ msgid "Langage"
 msgstr "Taal"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Kavel"
 
@@ -430,11 +409,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Status"
@@ -450,8 +427,7 @@ msgid "Antique/Cartoons"
 msgstr "Antiek/Cartoons"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -537,8 +513,7 @@ msgid "auction.dates"
 msgstr "Veilingsdatums"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Kopers"
 
@@ -766,8 +741,7 @@ msgid "Antique/Toys"
 msgstr "Antiek/speelgoed"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Gemaakt door"
 
@@ -895,8 +869,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat.nr."
 
@@ -931,8 +904,7 @@ msgid "API ID"
 msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "Bod-ID"
 
@@ -985,16 +957,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antiek/kleden en textiel"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Sch."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Datum"
@@ -1035,14 +1004,12 @@ msgid "Specific Costs"
 msgstr "Specifieke kosten"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Som sch."
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Veilingen"
 
@@ -1077,8 +1044,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Nr"
@@ -1126,8 +1092,7 @@ msgid "Detailed lots"
 msgstr "Gedetailleerde percelen"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Kavelstatistieken"
 
@@ -1142,8 +1107,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Stuur resultaten naar Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat.nr."
 
@@ -1187,8 +1151,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Subtotaal:"
 
@@ -1204,8 +1167,7 @@ msgid "Invoice Number"
 msgstr "Factuurnummer"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1228,8 +1190,7 @@ msgid "Name"
 msgstr "Naam"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1257,8 +1218,7 @@ msgid "Login"
 msgstr "Gebruiker"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Te betalen"
 
@@ -1278,8 +1238,7 @@ msgid "Seller Form"
 msgstr "Verkopersformulier"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Kavelcategorie"
 
@@ -1348,8 +1307,7 @@ msgid "Payment's history"
 msgstr "Betalingsgeschiedenis"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Document"
 
@@ -1421,8 +1379,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1470,8 +1427,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1481,8 +1437,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1614,16 +1569,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1654,10 +1607,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1802,8 +1753,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objecten"
@@ -1825,12 +1775,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1840,17 +1787,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -2002,8 +1944,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2027,16 +1968,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2108,8 +2047,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2129,8 +2067,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2207,8 +2144,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2245,8 +2181,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2275,8 +2210,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2422,16 +2356,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2441,8 +2370,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2504,8 +2432,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2569,3 +2496,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index fece26f69a6..73ca3e0901a 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1791,8 +1742,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1814,12 +1764,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1829,17 +1776,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1991,8 +1933,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2016,16 +1957,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2097,8 +2036,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2118,8 +2056,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2196,8 +2133,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2234,8 +2170,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2264,8 +2199,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2411,16 +2345,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2430,8 +2359,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2493,8 +2421,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2558,3 +2485,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index 4316605128c..2383235fa25 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Sprzedawca"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Kupujący"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Sztuka nowoczesna"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Odnośnik"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Obiekt"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Stan"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1792,8 +1743,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1815,12 +1765,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1830,17 +1777,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1992,8 +1934,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2017,16 +1958,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2098,8 +2037,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2119,8 +2057,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2197,8 +2134,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2235,8 +2171,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2265,8 +2200,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2412,16 +2346,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2431,8 +2360,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2494,8 +2422,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2559,3 +2486,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menu"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index c42b5f90bea..e1385879e9e 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Definir como rascunho"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Vendedor"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Formulário do depósito"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Numero de objectos"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antiguidades/livros, manuscritos, etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objetos por Leilão"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Numero de lista"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Arte contemporânea"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Referençia"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr "Custos do vendedor"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr "Objectos vendidos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Somar margem neto"
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr "Linguagem"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objecto"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Estado"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Compradores"
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Criado por"
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr "ID da API"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Data"
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Num"
@@ -1117,10 +1083,9 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "Estactisticas do objecto"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Sub total:"
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr "Numero da factura"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr "Iniciar sessão"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1604,16 +1559,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1644,10 +1597,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1792,8 +1743,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objectos"
@@ -1815,12 +1765,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1830,17 +1777,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1992,8 +1934,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2017,16 +1958,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2098,8 +2037,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2119,8 +2057,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2197,8 +2134,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2235,8 +2171,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2265,8 +2200,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2412,16 +2346,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2431,8 +2360,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2494,8 +2422,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2559,3 +2486,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Objectos por dia"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Gerir Leilão"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Sumário apontando por utilizador"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Membro do leilão"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Gerir Leilão "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimação/Adjudicação"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Adjudicação total"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Últimos objectos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Últimos depósitos"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menu"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Meus objectos por dia"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Meu quadro"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Quadro de gestão de leilão"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Min/adj/Max"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Meus ultimos objectos"
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 552bd866dd2..46ddbdca567 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Definir como rascunho"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Loja"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Formulário de Depósitos"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Comprador"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Nenhum dos objetos"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Limite de Depósito"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Objetos em leilão"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Número de lista"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Arte contemporânea"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr "Margem líquida (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -303,9 +290,7 @@ msgid "Seller Costs"
 msgstr "Custos do Vendedor"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -328,8 +313,7 @@ msgid "Contact"
 msgstr "Contato"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -370,8 +354,7 @@ msgid "Sold Objects"
 msgstr "Objetos vendidos"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Somar margem líquida"
 
@@ -381,9 +364,7 @@ msgid "Deposit Border Form"
 msgstr "Formuálio de Limite de Depósito"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Lance"
@@ -394,10 +375,8 @@ msgid "Langage"
 msgstr "Idioma"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objeto"
 
@@ -430,11 +409,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Situação"
@@ -450,8 +427,7 @@ msgid "Antique/Cartoons"
 msgstr "Antigo/Desenhos"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -536,8 +512,7 @@ msgid "auction.dates"
 msgstr "leilão.datas"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Vendedores"
 
@@ -764,8 +739,7 @@ msgid "Antique/Toys"
 msgstr "Antiguidade/Briquedos"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Criado por"
 
@@ -893,8 +867,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -929,8 +902,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -983,16 +955,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1033,14 +1002,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1075,8 +1042,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1124,8 +1090,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1140,8 +1105,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1185,8 +1149,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1202,8 +1165,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1226,8 +1188,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1255,8 +1216,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1276,8 +1236,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1346,8 +1305,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1419,8 +1377,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1468,8 +1425,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1479,8 +1435,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1611,16 +1566,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1651,10 +1604,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1800,8 +1751,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objetos"
@@ -1823,12 +1773,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1838,17 +1785,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -2000,8 +1942,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2025,16 +1966,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2106,8 +2045,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2127,8 +2065,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2205,8 +2142,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2243,8 +2179,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2273,8 +2208,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2420,16 +2354,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2439,8 +2368,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2502,8 +2430,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2567,3 +2494,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index cebc56035a5..c71fea04caa 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Setează în ciornă"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Vânzător"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Formular de depozit"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Cumpărător"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Nr. de obiecte"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Antichităţi/Cărţi, manuscrise, etc."
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Limită depozit"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "Obiecte pe licitaţii"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Număr pe listă"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Artă contemporană"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref"
 
@@ -262,8 +251,7 @@ msgstr ""
 "Eroare: Intrare (resp. Ieşire) trebuie să urmeze după Ieşire (resp. Intrare)"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Total adj."
 
@@ -273,8 +261,7 @@ msgid "Net margin (%)"
 msgstr "Marjă netă (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -302,9 +289,7 @@ msgid "Seller Costs"
 msgstr "Costuri vânzător"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -327,8 +312,7 @@ msgid "Contact"
 msgstr "Contact"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "Nr ob. ret."
@@ -369,8 +353,7 @@ msgid "Sold Objects"
 msgstr "Obiecte vândute"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Marjă sumă netă"
 
@@ -380,9 +363,7 @@ msgid "Deposit Border Form"
 msgstr "Formular limită depozit"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Licitare"
@@ -393,10 +374,8 @@ msgid "Langage"
 msgstr "Limbaj"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Obiect"
 
@@ -429,11 +408,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Raportare cumpărător licitaţie din afişare"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Stare"
@@ -449,8 +426,7 @@ msgid "Antique/Cartoons"
 msgstr "Antichităţi/Desene"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -535,8 +511,7 @@ msgid "auction.dates"
 msgstr "auction.dates"
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Cumpărători"
 
@@ -764,8 +739,7 @@ msgid "Antique/Toys"
 msgstr "Antichităţi / Jucării"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Creat de"
 
@@ -893,8 +867,7 @@ msgid "Gestion emporte"
 msgstr "Gestiune intrări"
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr "Cat. N."
 
@@ -929,8 +902,7 @@ msgid "API ID"
 msgstr "Id API"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "Id licitare"
 
@@ -983,16 +955,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Antichităţi / Covoare şi textile"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Adj."
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Data"
@@ -1033,14 +1002,12 @@ msgid "Specific Costs"
 msgstr "Costuri specifice"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr "Sumă adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Licitaţii"
 
@@ -1075,8 +1042,7 @@ msgid "Aie Category"
 msgstr "Categorie auxiliară"
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr "Num"
@@ -1124,8 +1090,7 @@ msgid "Detailed lots"
 msgstr "Loturi detaliate"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Statistici obiecte"
 
@@ -1140,8 +1105,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Trimitere rezultate la Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "Cat. N"
 
@@ -1185,8 +1149,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Subtotal:"
 
@@ -1202,8 +1165,7 @@ msgid "Invoice Number"
 msgstr "Numărul facturii"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1226,8 +1188,7 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1255,8 +1216,7 @@ msgid "Login"
 msgstr "Username"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "De plată"
 
@@ -1276,8 +1236,7 @@ msgid "Seller Form"
 msgstr "Formular vânzător"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Categoria obiectului"
 
@@ -1346,8 +1305,7 @@ msgid "Payment's history"
 msgstr "Istoric plăţi"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Document"
 
@@ -1419,8 +1377,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Artă cont./Curiozităţi"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1468,8 +1425,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Artă cont./Bijuterii"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -1479,8 +1435,7 @@ msgid "Next Auctions"
 msgstr "Licitaţii viitoare"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1612,16 +1567,14 @@ msgid "Buyer Journal"
 msgstr "Jurnal cumpărător"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Plătit"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1652,10 +1605,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Antichităţi/Sculptură, bronz etc."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1801,8 +1752,7 @@ msgid "Plate Number:"
 msgstr "Număr de identificare"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Obiecte"
@@ -1824,12 +1774,9 @@ msgid "Allow Negative Amount"
 msgstr "Permite sold negativ"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Licitație"
 
@@ -1839,17 +1786,12 @@ msgid "Cont. Art/Shows"
 msgstr "Artă cont./Spectacole"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Data licitaţiei"
@@ -2001,8 +1943,7 @@ msgstr "Prima zi de expunere"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 "Avertizare, asta va şterge preţul de adjudecare a obiectului şi cumpărătorul "
 "lui !"
@@ -2028,16 +1969,14 @@ msgid "Income Account"
 msgstr "Cont de venituri"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Venit net"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Limită"
 
@@ -2109,8 +2048,7 @@ msgid "Closed"
 msgstr "Închis"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Comision"
 
@@ -2130,8 +2068,7 @@ msgid "Employee"
 msgstr "Angajat"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Adj.(EUR)"
 
@@ -2208,8 +2145,7 @@ msgid "Invoiced"
 msgstr "Facturat"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Ridicat"
 
@@ -2246,8 +2182,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr "Eroare ! Nu puteţi crea membri asociaţi recursiv."
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2276,8 +2211,7 @@ msgid "Adj"
 msgstr "Adj"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Date licitaţii"
 
@@ -2423,16 +2357,11 @@ msgid "Report Sign In/Out"
 msgstr "Raportare acces"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Descriere"
 
@@ -2442,8 +2371,7 @@ msgid "Cont. Art/Arts"
 msgstr "Artă cont./Arte"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Preţ de adjudecare"
@@ -2505,8 +2433,7 @@ msgid "Pay objects"
 msgstr "Plată obiecte"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Nr. obiecte"
 
@@ -2570,3 +2497,88 @@ msgstr "Istoric licitaţie"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Comenzi"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Obiecte pe zile"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Manager licitaţii"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Indicare rezumat pe utilizatori"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Membru licitaţie"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "Panou membru licitaţie"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Managet licitaţie "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Panou pentru licitaţie"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Estimări/Adjudecări"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Total adjudecări"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Ultimele obiecte"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Ultimele depozite"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Meniu"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Obiectele mele pe zile"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Panoul meu"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Panou manager licitaţie"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Min/Adj/Max"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Ultimele mele obiecte"
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 717f5d8afd1..33407209b74 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Продавец"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "Форма депозита"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Покупатель"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Кол-во объектов"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "Антиквариат/ книги, манускрипты, и т.д"
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Граница депозита"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "Номер списка"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Современное искусство"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ссылка"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr "Общий рез-т"
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr "Чистая маржа (%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr "Стоимости продавца"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "Контакт"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr "Проданные объекты"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "Суммарная чистая маржа"
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr "Форма границы депозита"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Заявка"
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr "Язык"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Объект"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr "Вид вормы отчета покупателя аукцциона"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Статус"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr "Antique/ Эскизы"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Покупатели"
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr "Антиквариат/ Игрушки"
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Создано"
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr "API ID"
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr "ID заявки"
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr "Антиквариат/ ковры и текстиль"
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr "Рез-т"
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Дата"
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Аукционы"
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr "Подробные лоты"
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Статистика объектов"
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Отправить результаты на Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr "№ по кат."
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr "Подитог"
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr "Номер счета"
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr "Название"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr "Учетная запись"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "К оплате"
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr "Форма продавца"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr "Категория объекта"
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr "Журнал платежей"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Документ"
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr "Совр. искусство/ Редкости"
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr "Совр. искусство/ Ювелирные изделия"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr "След. аукционы"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "№"
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr "Книга покупателя"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Оплачено"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Телефон"
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr "Антиквариат/ Скульптура, бронза и т.п."
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Итого:"
 
@@ -1792,8 +1743,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Объекты"
@@ -1815,12 +1765,9 @@ msgid "Allow Negative Amount"
 msgstr "Разрешить отрицательные суммы"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Аукцион"
 
@@ -1830,17 +1777,12 @@ msgid "Cont. Art/Shows"
 msgstr "Совр. искусство/ Выставки"
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Дата аукциона"
@@ -1992,8 +1934,7 @@ msgstr "Первый день экпозиции"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr "Внимание, это удалит результат цены объекта и покупателя!"
 
 #. module: auction
@@ -2017,16 +1958,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr "Чистая выручка"
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr "Лимит"
 
@@ -2098,8 +2037,7 @@ msgid "Closed"
 msgstr "Закрыто"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr "Комиссия"
 
@@ -2119,8 +2057,7 @@ msgid "Employee"
 msgstr "Сотрудник"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr "Рез-т(EUR)"
 
@@ -2197,8 +2134,7 @@ msgid "Invoiced"
 msgstr "Выставлен счет"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr "Забрано"
 
@@ -2235,8 +2171,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2265,8 +2200,7 @@ msgid "Adj"
 msgstr "Рез-т"
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Даты аукциона"
 
@@ -2412,16 +2346,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Описание"
 
@@ -2431,8 +2360,7 @@ msgid "Cont. Art/Arts"
 msgstr "Совр. искусство/ Ремесла"
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr "Цена результата"
@@ -2494,8 +2422,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr "Кол-во объектов"
 
@@ -2559,3 +2486,88 @@ msgstr "Журнал аукциона"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Заказы"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Объекты по дням"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Менеджер аукциона"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Участник аукциона"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Менелжер аукциона "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Оценка / Результат"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Итоговые результаты"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Новейшие объекты"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Новейшие депозиты"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Меню"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Мои объекты по дням"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Моя панель"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Панель менеджера аукциона"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Ми/Рез-т/Макс"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Мои новейшие объекты"
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index 151d1ce93f3..e0bebcd6d12 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "V osnutek"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Prodajalec"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Kupec"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "Sodobna umetnost"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Sklic"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "Stik"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr "Prodani predmeti"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Ponudba"
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Predmet"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Stanje"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1791,8 +1742,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Predmeti"
@@ -1814,12 +1764,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1829,17 +1776,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1991,8 +1933,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2016,16 +1957,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2097,8 +2036,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2118,8 +2056,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2196,8 +2133,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2234,8 +2170,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2264,8 +2199,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2411,16 +2345,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2430,8 +2359,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2493,8 +2421,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2558,3 +2485,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Vodja dražbe"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Vodaj dražbe "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index 6957db97d2b..117f54a57e1 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Köpare"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "Antal objekt"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "Bud"
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr "Språk"
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Objekt"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Status"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Köpare"
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr "Skapad av"
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Datum"
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Auktioner"
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr "Objektstatistik"
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr "Skicka resultat till Auction-in-europe.com"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr "-"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr "Namn"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr "Logga in"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr "Att betala"
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr "Dokument"
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr "Inventarium"
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr "Nästa auktion"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr "#"
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Betald"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Telefon"
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr "Totalt:"
 
@@ -1791,8 +1742,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objekt"
@@ -1814,12 +1764,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Auktion"
 
@@ -1829,17 +1776,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Auktionsdatum"
@@ -1991,8 +1933,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2016,16 +1957,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2097,8 +2036,7 @@ msgid "Closed"
 msgstr "Stängd"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2118,8 +2056,7 @@ msgid "Employee"
 msgstr "Anställd"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2196,8 +2133,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2234,8 +2170,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2264,8 +2199,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr "Auktionsdatum"
 
@@ -2411,16 +2345,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -2430,8 +2359,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2493,8 +2421,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2558,3 +2485,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index 2f5c00fccb7..ff2286e0cc0 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index b5143265550..8b59c95d753 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "Taslak olarak Ayarla"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "Satıcı"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "Alıcı"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "Teminat Sınırı"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "Ref"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr "Satıcı Maliyeti"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "Kişi"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr "Teminat Sınır Formu"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "Nesne"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "Durum"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr "Alıcılar"
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr "Tarih"
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr "Açık Artırmalar"
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr "Fatura No."
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr "Adı"
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr "Satıcı Formu"
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr "Sonraki Açık Artırmalar"
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr "Ödendi"
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr "Telefon No."
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Objeler"
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr "Açık Artırma"
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr "Açık Artırma Tarihi"
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr "Gelir Hesabı"
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr "Kapalı"
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr "Personel"
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr "Faturalandı"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr "Giriş/Çıkış Raporu"
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr "Açıklama"
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Son Teminatlar"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Menü"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index 13ce2f5fccd..9e6e6c48bb5 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1791,8 +1742,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "Об'єкти"
@@ -1814,12 +1764,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1829,17 +1776,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1991,8 +1933,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2016,16 +1957,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2097,8 +2036,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2118,8 +2056,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2196,8 +2133,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2234,8 +2170,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2264,8 +2199,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2411,16 +2345,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2430,8 +2359,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2493,8 +2421,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2558,3 +2485,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 7afc40c8cd5..cdd945f6eef 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr "设为草稿"
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr "卖方"
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr "押金方式"
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr "买家"
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr "没有物品"
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr "古董/书籍/手稿"
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr "押金最少"
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr "拍卖物品"
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr "表编号"
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr "当代艺术"
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr "参考"
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr "错误:登入必须要先登出"
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr "净利润(%)"
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr "卖家费用"
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr "联系"
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr "物品#"
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr "已卖出的物品"
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr "合计净利润"
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr "押金最少方式"
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr "出价"
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr "物品"
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr "拍卖买方报表"
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr "状态"
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr "古董/卡通"
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -547,9 +522,9 @@ msgid "Amount paid"
 msgstr ""
 
 #. module: auction
-#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
+#: view:board.board:0
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "我最近的押金"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -909,7 +882,7 @@ msgstr ""
 #. module: auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: auction
 #: view:report.auction.view:0
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,10 +1083,9 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "物品统计"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr "对象"
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "天物品"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "拍卖管理"
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "每用户摘要指示"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr "拍卖会员"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr "拍卖会员控制台"
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "拍卖管理 "
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr "拍卖控制台"
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "评价/最终结果"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "最终结果合计"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "最新的物品"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "最近的押金"
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "菜单"
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "每天我的物品"
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr "我的控制台"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "拍卖管理控制台"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "最少/邻近/最大"
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "我最后的物品"
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index d6ae90ebf2a..5264d616d89 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* auction
+# 	* auction
 #
 msgid ""
 msgstr ""
@@ -32,12 +32,9 @@ msgid "Set to draft"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,partner_id:0
-#: view:auction.lots:0
-#: xsl:report.auction.seller.list:0
-#: field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0
-#: field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0 view:auction.lots:0
+#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
 msgid "Seller"
 msgstr ""
 
@@ -90,23 +87,18 @@ msgid "Deposit Form"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: field:auction.lots,ach_uid:0
+#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0
-#: rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0
-#: field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,nobjects:0
-#: field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
 msgid "No of objects"
 msgstr ""
 
@@ -131,8 +123,7 @@ msgid "Antique/Books, manuscripts, eso."
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
 msgstr ""
 
@@ -204,8 +195,7 @@ msgid "Objects by Auction"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_num:0
-#: field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
 msgid "List Number"
 msgstr ""
 
@@ -240,8 +230,7 @@ msgid "Contemporary Art"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: view:report.unclassified.objects:0
+#: view:auction.lots:0 view:report.unclassified.objects:0
 msgid "Ref"
 msgstr ""
 
@@ -261,8 +250,7 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: field:report.buyer.auction,total_price:0
+#: view:auction.lots:0 field:report.buyer.auction,total_price:0
 msgid "Total Adj."
 msgstr ""
 
@@ -272,8 +260,7 @@ msgid "Net margin (%)"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
@@ -301,9 +288,7 @@ msgid "Seller Costs"
 msgstr ""
 
 #. module: auction
-#: view:auction.bid:0
-#: view:auction.bid_line:0
-#: view:auction.lots:0
+#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
 #: field:auction.lots,bid_lines:0
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -326,8 +311,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: auction
-#: field:report.auction.view,obj_ret:0
-#: field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
 msgstr ""
@@ -368,8 +352,7 @@ msgid "Sold Objects"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum net margin"
 msgstr ""
 
@@ -379,9 +362,7 @@ msgid "Deposit Border Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,bid_lines:0
-#: rml:auction.bids:0
-#: rml:bids.lots:0
+#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
 msgstr ""
@@ -392,10 +373,8 @@ msgid "Langage"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid_line,lot_id:0
-#: field:auction.lot.history,lot_id:0
-#: view:auction.lots:0
-#: model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
+#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
 msgid "Object"
 msgstr ""
 
@@ -428,11 +407,9 @@ msgid "Auction buyer reporting form view"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,state:0
-#: field:auction.lots,state:0
+#: field:auction.dates,state:0 field:auction.lots,state:0
 #: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0
-#: field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
 msgstr ""
@@ -448,8 +425,7 @@ msgid "Antique/Cartoons"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
@@ -534,8 +510,7 @@ msgid "auction.dates"
 msgstr ""
 
 #. module: auction
-#: rml:auction.total.rml:0
-#: model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
 msgstr ""
 
@@ -757,8 +732,7 @@ msgid "Antique/Toys"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,create_uid:0
-#: field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
 msgid "Created by"
 msgstr ""
 
@@ -886,8 +860,7 @@ msgid "Gestion emporte"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Cat. N."
 msgstr ""
 
@@ -922,8 +895,7 @@ msgid "API ID"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,name:0
-#: field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
 msgid "Bid ID"
 msgstr ""
 
@@ -976,16 +948,13 @@ msgid "Antique/Carpet and textilles"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.seller.list:0
-#: field:report.object.encoded.manager,adj:0
+#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
 msgid "Adj."
 msgstr ""
 
 #. module: auction
-#: field:auction.lot.history,name:0
-#: field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0
-#: xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0 field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
 #: field:report.auction.estimation.adj.category,date:0
 msgid "Date"
 msgstr ""
@@ -1026,14 +995,12 @@ msgid "Specific Costs"
 msgstr ""
 
 #. module: auction
-#: view:report.buyer.auction2:0
-#: view:report.seller.auction2:0
+#: view:report.buyer.auction2:0 view:report.seller.auction2:0
 msgid "Sum adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: view:report.auction.view2:0
+#: view:auction.dates:0 view:report.auction.view2:0
 msgid "Auctions"
 msgstr ""
 
@@ -1068,8 +1035,7 @@ msgid "Aie Category"
 msgstr ""
 
 #. module: auction
-#: xsl:flagey.huissier:0
-#: rml:report.auction.buyer.result:0
+#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
 #: xsl:report.auction.deposit:0
 msgid "Num"
 msgstr ""
@@ -1117,8 +1083,7 @@ msgid "Detailed lots"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "Objects statistics"
 msgstr ""
 
@@ -1133,8 +1098,7 @@ msgid "Send results to Auction-in-europe.com"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Cat.N"
 msgstr ""
 
@@ -1178,8 +1142,7 @@ msgid "-"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Subtotal:"
 msgstr ""
 
@@ -1195,8 +1158,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: field:report.buyer.auction,date:0
-#: field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
 #: field:report.object.encoded,date:0
 #: field:report.object.encoded.manager,date:0
 #: field:report.seller.auction,date:0
@@ -1219,8 +1181,7 @@ msgid "Name"
 msgstr ""
 
 #. module: auction
-#: field:auction.deposit,name:0
-#: field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
 #: field:report.deposit.border,bord:0
 #: field:report.unclassified.objects,bord_vnd_id:0
@@ -1248,8 +1209,7 @@ msgid "Login"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "To pay"
 msgstr ""
 
@@ -1269,8 +1229,7 @@ msgid "Seller Form"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,lot_type:0
-#: field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
 msgid "Object category"
 msgstr ""
 
@@ -1339,8 +1298,7 @@ msgid "Payment's history"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Document"
 msgstr ""
 
@@ -1412,8 +1370,7 @@ msgid "Cont. Art/Curiosa"
 msgstr ""
 
 #. module: auction
-#: field:auction.bid,auction_id:0
-#: field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
 #: wizard_field:auction.lots.auction_move,init,auction_id:0
 #: wizard_field:auction.lots.send.aie,date_ask,dates:0
 #: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1461,8 +1418,7 @@ msgid "Cont. Art/Jewelry"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
 msgid "Inventory"
 msgstr ""
 
@@ -1472,8 +1428,7 @@ msgid "Next Auctions"
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.seller.list:0
+#: rml:buyer.list:0 xsl:report.auction.seller.list:0
 msgid "#"
 msgstr ""
 
@@ -1603,16 +1558,14 @@ msgid "Buyer Journal"
 msgstr ""
 
 #. module: auction
-#: selection:auction.lots,state:0
-#: xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
 #: selection:report.object.encoded,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Paid"
 msgstr ""
 
 #. module: auction
-#: rml:bids.lots:0
-#: rml:bids.phones.details:0
+#: rml:bids.lots:0 rml:bids.phones.details:0
 msgid "Phone"
 msgstr ""
 
@@ -1643,10 +1596,8 @@ msgid "Antique/Sculpture, bronze, eso."
 msgstr ""
 
 #. module: auction
-#: rml:buyer.list:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
 msgid "Total:"
 msgstr ""
 
@@ -1790,8 +1741,7 @@ msgid "Plate Number:"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,lot_id:0
+#: view:auction.deposit:0 field:auction.deposit,lot_id:0
 #: model:ir.ui.menu,name:auction.auction_objects_menu
 msgid "Objects"
 msgstr ""
@@ -1813,12 +1763,9 @@ msgid "Allow Negative Amount"
 msgstr ""
 
 #. module: auction
-#: rml:auction.bids:0
-#: view:auction.lots:0
-#: rml:auction.total.rml:0
+#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
 msgid "Auction"
 msgstr ""
 
@@ -1828,17 +1775,12 @@ msgid "Cont. Art/Shows"
 msgstr ""
 
 #. module: auction
-#: field:auction.dates,name:0
-#: field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
 #: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0
-#: field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0
-#: field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0
-#: field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0
-#: field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
 #: field:report.unclassified.objects,auction:0
 msgid "Auction date"
 msgstr ""
@@ -1990,8 +1932,7 @@ msgstr ""
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid ""
-"Warning, this will erase the object adjudication price and its buyer !"
+msgid "Warning, this will erase the object adjudication price and its buyer !"
 msgstr ""
 
 #. module: auction
@@ -2015,16 +1956,14 @@ msgid "Income Account"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,net_revenue:0
-#: field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
 #: field:report.object.encoded.manager,net_revenue:0
 #: field:report.seller.auction2,net_revenue:0
 msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
 msgid "Limit"
 msgstr ""
 
@@ -2096,8 +2035,7 @@ msgid "Closed"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_comm:0
-#: field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
 msgid "Commission"
 msgstr ""
 
@@ -2117,8 +2055,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: auction
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
 msgid "Adj.(EUR)"
 msgstr ""
 
@@ -2195,8 +2132,7 @@ msgid "Invoiced"
 msgstr ""
 
 #. module: auction
-#: view:auction.lots:0
-#: selection:auction.lots,state:0
+#: view:auction.lots:0 selection:auction.lots,state:0
 msgid "Taken away"
 msgstr ""
 
@@ -2233,8 +2169,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: auction
-#: selection:auction.dates,state:0
-#: selection:auction.lots,state:0
+#: selection:auction.dates,state:0 selection:auction.lots,state:0
 #: selection:report.auction.adjudication,state:0
 #: selection:report.object.encoded,state:0
 #: selection:report.seller.auction,state:0
@@ -2263,8 +2198,7 @@ msgid "Adj"
 msgstr ""
 
 #. module: auction
-#: view:auction.dates:0
-#: model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
 msgid "Auction Dates"
 msgstr ""
 
@@ -2410,16 +2344,11 @@ msgid "Report Sign In/Out"
 msgstr ""
 
 #. module: auction
-#: view:auction.deposit:0
-#: field:auction.deposit,info:0
-#: view:auction.lots:0
+#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
 #: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0
-#: xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0
-#: xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0 xsl:flagey.huissier:0
+#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
 msgid "Description"
 msgstr ""
 
@@ -2429,8 +2358,7 @@ msgid "Cont. Art/Arts"
 msgstr ""
 
 #. module: auction
-#: field:auction.lots,obj_price:0
-#: field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
 #: field:report.unclassified.objects,obj_price:0
 msgid "Adjudication price"
 msgstr ""
@@ -2492,8 +2420,7 @@ msgid "Pay objects"
 msgstr ""
 
 #. module: auction
-#: view:report.object.encoded:0
-#: view:report.object.encoded.manager:0
+#: view:report.object.encoded:0 view:report.object.encoded.manager:0
 msgid "# objects"
 msgstr ""
 
@@ -2557,3 +2484,88 @@ msgstr ""
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Auction Member"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction member board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: model:ir.module.module,shortdesc:auction.module_meta_information
+msgid "Board for Auction"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Menu"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My board"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr ""
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index 0d87709cbee..fe6ce584339 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.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/>.
 #
 ##############################################################################
 
@@ -132,12 +132,6 @@ class report_custom(report_rml):
 
 #       file('/tmp/terp.xml','wb+').write(xml)
 #       end_time = time.clock()
-#       print "db:", mid_time-start_time
-#       print "addition:", mid_time2-mid_time
-#       print "buyer costs:", mid_time3-mid_time2
-#       print "seller costs:", mid_time4-mid_time3
-#       print "rest:", end_time-mid_time4
-#       print "total:", end_time-start_time
         return self.post_process_xml_data(cr, uid, xml, context)
 
 report_custom('report.auction.total', 'auction.lots', '', 'addons/auction/report/total.xsl')
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index cc3a2e304f7..9dac045a449 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -22,15 +22,4 @@
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
 "access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,0,0,0
 "access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,0,0,0
-"access_auction_lots_able","auction.lots.able","model_auction_lots_able","base.group_user",1,0,0,0
-"access_auction_lots_auction_move","auction.lots.auction.move","model_auction_lots_auction_move","base.group_user",1,0,0,0
-"access_auction_lots_enable","auction.lots.enable","model_auction_lots_enable","base.group_user",1,0,0,0
-"access_auction_lots_make_invoice_buyer","auction.lots.make.invoice.buyer","model_auction_lots_make_invoice_buyer","base.group_user",1,0,0,0
-"access_auction_lots_make_invoice","auction.lots.make.invoice","model_auction_lots_make_invoice","base.group_user",1,0,0,0
-"access_auction_lots_sms_send","auction.lots.sms.send","model_auction_lots_sms_send","base.group_user",1,0,0,0
-"access_auction_pay_buy","auction.pay.buy","model_auction_pay_buy","base.group_user",1,0,0,0
-"acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0
-"access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0
-"acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0
-"access_auction_catalog_flagey","auction.catalog.flagey","model_auction_catalog_flagey","base.group_user",1,0,0,0
 "access_auction_lots_buyer_map_user","auction_lots_buyer_map_user","model_auction_lots_buyer_map","base.group_user",1,0,0,0
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 28028f45538..ef8d5a98887 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -29,14 +29,14 @@ class auction_pay_buy(osv.osv_memory):
     _description = "Pay buy"
     
     _columns= {
-       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'amount': fields.float('Amount paid', digits= (16, 2)), 
        'buyer_id':fields.many2one('res.partner', 'Buyer'), 
        'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
-       'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'amount2': fields.float('Amount paid', digits= (16, 2)), 
        'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
-       'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
+       'amount3': fields.float('Amount paid', digits = (16, 2)), 
        'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
-       'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
+       'total': fields.float('Amount paid', digits = (16, 2), readonly =True), 
     }
     
     def default_get(self, cr, uid, fields, context):
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 6873092c7e9..711cb8dcedc 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -27,7 +27,7 @@ class auction_pay_sel(osv.osv_memory):
     _description = "Pay Invoice"
     
     _columns= {
-       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
+       'amount': fields.float('Amount paid', digits= (16, 2), required=True), 
        'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
        'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
        'period_id':fields.many2one('account.period', 'Period', required=True), 
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index dda9f7880f3..c5bcad7c68f 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index 9aba9ddf598..ac367182f26 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -5,4 +5,3 @@
 "access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
 "access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
 "access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
-"access_audittrail_view_log","audittrail.view.log","model_audittrail_view_log","base.group_user",1,1,1,1
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 2c6c8bf3f9b..2d18f675c6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -24,10 +24,10 @@
     "version" : "1.0", 
     "depends" : ["base"], 
     'description': """Full featured calendar system that supports:
-
+    - Calendar of events
     - Alerts (create requests)
-    - Recurring events (*)
-    - Invitations to others people""",
+    - Recurring events
+    - Invitations to people""",
     "author" : "Tiny",
     'category': 'Generic Modules/Others',
     'website': 'http://www.openerp.com',
@@ -42,7 +42,7 @@
         'wizard/base_calendar_set_exrule_view.xml',
         'base_calendar_view.xml'
     ],
-   # "test" : ['test/base_calendar_test.yml'],
+    "test" : ['test/base_calendar_test.yml'],
     "installable" : True,
     "active" : False,
 }
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c16477280c7..f9f6567747f 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -50,15 +50,17 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
 
     if not startdate:
         startdate = datetime.now()
-    rset1 = rrule.rrulestr(rrulestring, dtstart=startdate, forceset=True)
+    if not exdate:
+        exdate = []
+    rset1 = rrule.rrulestr(str(rrulestring), dtstart=startdate, forceset=True)
 
     for date in exdate:
         datetime_obj = todate(date)
         rset1._exdate.append(datetime_obj)
     if exrule:
         rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate))
-    re_dates = map(lambda x:x.strftime('%Y-%m-%d %H:%M:%S'), rset1._iter())
-    return re_dates
+
+    return list(rset1._iter())
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     """
@@ -375,7 +377,7 @@ property or property parameter."),
         'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
      }
     _defaults = {
-        'state': lambda *x: 'needs-action',
+        'state': 'needs-action',
     }
     
     def copy(self, cr, uid, id, default=None, context=None):
@@ -524,8 +526,7 @@ property or property parameter."),
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values 
         """
-
-        self.write(cr, uid, ids, {'state': 'tentative'}, context)
+        return self.write(cr, uid, ids, {'state': 'tentative'}, context)
 
     def do_accept(self, cr, uid, ids, context=None, *args):
         """
@@ -561,7 +562,7 @@ property or property parameter."),
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values """
 
-        self.write(cr, uid, ids, {'state': 'declined'}, context)
+        return self.write(cr, uid, ids, {'state': 'declined'}, context)
 
     def create(self, cr, uid, vals, context=None):
         """ Overrides orm create method.
@@ -576,7 +577,7 @@ property or property parameter."),
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
             email = filter(lambda x:x.__contains__('@'), cnval)
-            vals['email'] = email[0]
+            vals['email'] = email and email[0] or ''
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
         return res
@@ -608,11 +609,11 @@ are both optional, but if one occurs, so MUST the other"""),
 true, it will allow you to hide the event alarm information without removing it.")
     }
     _defaults = {
-        'trigger_interval': lambda *x: 'minutes',
-        'trigger_duration': lambda *x: 5,
-        'trigger_occurs': lambda *x: 'before',
-        'trigger_related': lambda *x: 'start',
-        'active': lambda *x: 1,
+        'trigger_interval': 'minutes',
+        'trigger_duration': 5,
+        'trigger_occurs': 'before',
+        'trigger_related': 'start',
+        'active': 1,
     }
 
     def do_alarm_create(self, cr, uid, ids, model, date, context=None):
@@ -629,6 +630,7 @@ true, it will allow you to hide the event alarm information without removing it.
         if not context:
             context = {}
         alarm_obj = self.pool.get('calendar.alarm')
+        res_alarm_obj = self.pool.get('res.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
 
@@ -636,9 +638,31 @@ true, it will allow you to hide the event alarm information without removing it.
         for data in model_obj.browse(cr, uid, ids, context):
 
             basic_alarm = data.alarm_id
-            if not context.get('alarm_id', False):
-                self.do_alarm_unlink(cr, uid, [data.id], model)
-                return True
+            cal_alarm = data.base_calendar_alarm_id
+            if (not basic_alarm and cal_alarm) or (basic_alarm and cal_alarm):
+                new_res_alarm = None
+                # Find for existing res.alarm
+                duration = cal_alarm.trigger_duration
+                interval = cal_alarm.trigger_interval
+                occurs = cal_alarm.trigger_occurs
+                related = cal_alarm.trigger_related
+                domain = [('trigger_duration', '=', duration), ('trigger_interval', '=', interval), ('trigger_occurs', '=', occurs), ('trigger_related', '=', related)]
+                alarm_ids = res_alarm_obj.search(cr, uid, domain, context=context)
+                if not alarm_ids:
+                    val = {
+                            'trigger_duration': duration, 
+                            'trigger_interval': interval, 
+                            'trigger_occurs': occurs, 
+                            'trigger_related': related,
+                            'name': str(duration) + ' ' + str(interval) + ' '  + str(occurs)
+                           }
+                    new_res_alarm = res_alarm_obj.create(cr, uid, val, context=context)
+                else:
+                    new_res_alarm = alarm_ids[0]
+                cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
+                                    where id=%s' % (model_obj._table, \
+                                    cal_alarm.id, new_res_alarm, data.id))
+
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
@@ -730,8 +754,8 @@ class calendar_alarm(osv.osv):
      }
 
     _defaults = {
-        'action': lambda *x: 'email',
-        'state': lambda *x: 'run',
+        'action': 'email',
+        'state': 'run',
      }
 
     def create(self, cr, uid, vals, context=None):
@@ -769,61 +793,100 @@ class calendar_alarm(osv.osv):
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
         """
-
         if not context:
             context = {}
-        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        cr.execute("select alarm.id as id \
-                    from calendar_alarm alarm \
-                    where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
-        res = cr.dictfetchall()
-        alarm_ids = map(lambda x: x['id'], res)
-        #attendee_obj = self.pool.get('calendar.attendee')
+        current_datetime = datetime.now()
         request_obj = self.pool.get('res.request')
+        alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
+        
         mail_to = []
-        for alarm in self.browse(cr, uid, alarm_ids):
-            if alarm.action == 'display':
-                value = {
-                   'name': alarm.name,
-                   'act_from': alarm.user_id.id,
-                   'act_to': alarm.user_id.id,
-                   'body': alarm.description,
-                   'trigger_date': alarm.trigger_date,
-                   'ref_doc1': '%s,%s' % (alarm.model_id.model, alarm.res_id)
-                }
-                request_id = request_obj.create(cr, uid, value)
-                request_ids = [request_id]
-                for attendee in alarm.attendee_ids:
-                    if attendee.user_id:
-                        value['act_to'] = attendee.user_id.id
-                        request_id = request_obj.create(cr, uid, value)
-                        request_ids.append(request_id)
-                request_obj.request_send(cr, uid, request_ids)
 
-            if alarm.action == 'email':
-                sub = '[Openobject Remainder] %s' % (alarm.name)
-                body = """
-                Name: %s
-                Date: %s
-                Description: %s
+        for alarm in self.browse(cr, uid, alarm_ids, context=context):
+            next_trigger_date = None
+            update_vals = {}
+            model_obj = self.pool.get(alarm.model_id.model)
+            res_obj = model_obj.browse(cr, uid, alarm.res_id, context=context)
+            re_dates = []
 
-                From:
-                      %s
-                      %s
+            if res_obj.rrule:
+                event_date = datetime.strptime(res_obj.date, '%Y-%m-%d %H:%M:%S')
+                recurrent_dates = get_recurrent_dates(res_obj.rrule, res_obj.exdate, event_date, res_obj.exrule)
 
-                """  % (alarm.name, alarm.trigger_date, alarm.description, \
-                    alarm.user_id.name, alarm.user_id.signature)
-                mail_to = [alarm.user_id.address_id.email]
-                for att in alarm.attendee_ids:
-                    mail_to.append(att.user_id.address_id.email)
-                if mail_to:
-                    tools.email_send(
-                        tools.config.get('email_from', False),
-                        mail_to,
-                        sub,
-                        body
-                    )
-            self.write(cr, uid, [alarm.id], {'state':'done'})
+                trigger_interval = alarm.trigger_interval
+                if trigger_interval == 'days':
+                    delta = timedelta(days=alarm.trigger_duration)
+                if trigger_interval == 'hours':
+                    delta = timedelta(hours=alarm.trigger_duration)
+                if trigger_interval == 'minutes':
+                    delta = timedelta(minutes=alarm.trigger_duration)
+                delta = alarm.trigger_occurs == 'after' and delta or -delta
+
+                for rdate in recurrent_dates:
+                    if rdate + delta > current_datetime:
+                        break
+                    if rdate + delta <= current_datetime:
+                        re_dates.append(rdate.strftime("%Y-%m-%d %H:%M:%S"))
+                rest_dates = recurrent_dates[len(re_dates):]
+                next_trigger_date = rest_dates and rest_dates[0] or None
+
+            else:
+                re_dates = [alarm.trigger_date]
+
+            for r_date in re_dates:
+                ref = alarm.model_id.model + ',' + str(alarm.res_id)
+
+                # search for alreay sent requests
+                if request_obj.search(cr, uid, [('trigger_date', '=', r_date), ('ref_doc1', '=', ref)], context=context):
+                    continue
+
+                if alarm.action == 'display':
+                    value = {
+                       'name': alarm.name,
+                       'act_from': alarm.user_id.id,
+                       'act_to': alarm.user_id.id,
+                       'body': alarm.description,
+                       'trigger_date': r_date,
+                       'ref_doc1': ref
+                    }
+                    request_id = request_obj.create(cr, uid, value)
+                    request_ids = [request_id]
+                    for attendee in res_obj.attendee_ids:
+                        if attendee.user_id:
+                            value['act_to'] = attendee.user_id.id
+                            request_id = request_obj.create(cr, uid, value)
+                            request_ids.append(request_id)
+                    request_obj.request_send(cr, uid, request_ids)
+
+                if alarm.action == 'email':
+                    sub = '[Openobject Reminder] %s' % (alarm.name)
+                    body = """
+Event: %s
+Event Date: %s
+Description: %s
+
+From:
+      %s
+
+----
+%s
+
+"""  % (alarm.name, alarm.trigger_date, alarm.description, \
+                        alarm.user_id.name, alarm.user_id.signature)
+                    mail_to = [alarm.user_id.address_id.email]
+                    for att in alarm.attendee_ids:
+                        mail_to.append(att.user_id.address_id.email)
+                    if mail_to:
+                        tools.email_send(
+                            tools.config.get('email_from', False),
+                            mail_to,
+                            sub,
+                            body
+                        )
+            if next_trigger_date:
+                update_vals.update({'trigger_date': next_trigger_date})
+            else:
+                update_vals.update({'state': 'done'})
+            self.write(cr, uid, [alarm.id], update_vals)
         return True
 
 calendar_alarm()
@@ -992,6 +1055,7 @@ class calendar_event(osv.osv):
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
+                    cr.execute("UPDATE %s set exrule=Null where id=%s" % (self._table, event))
                 elif datas.get('rrule_type') == 'custom':
                     if datas.get('interval', 0) < 0:
                         raise osv.except_osv('Warning!', 'Interval can not be Negative')
@@ -1019,7 +1083,10 @@ class calendar_event(osv.osv):
         'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}), 
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
                                                 'Show as', states={'done': [('readonly', True)]}),
-        'base_calendar_url': fields.char('Caldav URL', size=264),
+        'base_calendar_url': fields.char('Caldav URL', size=264), 
+        'state': fields.selection([('tentative', 'Tentative'),
+                        ('confirmed', 'Confirmed'),
+                        ('cancelled', 'Cancelled')], 'State', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 defines the list of date/time exceptions for arecurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
@@ -1077,13 +1144,14 @@ true, it will allow you to hide the event alarm information without removing it.
     }
 
     _defaults = {
-         'class': lambda *a: 'public',
-         'show_as': lambda *a: 'busy',
-         'freq': lambda *x: 'None',
-         'select1': lambda *x: 'date',
-         'interval': lambda *x: 1,
-         'active': lambda *x: 1,
-    }
+            'state': 'tentative', 
+            'class': 'public',
+            'show_as': 'busy',
+            'freq': 'None',
+            'select1': 'date',
+            'interval': 1,
+            'active': 1,
+            }
 
     def open_event(self, cr, uid, ids, context=None):
         """
@@ -1246,13 +1314,12 @@ true, it will allow you to hide the event alarm information without removing it.
                         new_rrule_str.append(new_rule)
                     new_rrule_str = ';'.join(new_rrule_str)
                     rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule'])
-                    for rdate in rdates:
-                        r_date = datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
+                    for r_date in rdates:
                         if start_date and r_date < start_date:
                             continue
                         if until_date and r_date > until_date:
                             continue
-                        idval = real_id2base_calendar_id(data['id'], rdate)
+                        idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
                         result.append(idval)
                         count += 1
         if result:
@@ -1308,7 +1375,7 @@ true, it will allow you to hide the event alarm information without removing it.
             yearstring = bymonth + bystring
 
         if datas.get('end_date'):
-            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
+            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z'
         enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
                              ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
 
@@ -1386,9 +1453,10 @@ true, it will allow you to hide the event alarm information without removing it.
                 new_ids.append(event_id)
 
         res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
-        if vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'):
+        if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
+                or (vals.has_key('date') or vals.has_key('duration') or vals.has_key('date_deadline')):
+            # change alarm details
             alarm_obj = self.pool.get('res.alarm')
-            context.update({'alarm_id': vals.get('alarm_id')})
             alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
                                             context=context)
         return res
@@ -1438,7 +1506,7 @@ true, it will allow you to hide the event alarm information without removing it.
             fields.append('date')
         for base_calendar_id, real_id in select:
             res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
-            ls = base_calendar_id2real_id(base_calendar_id, with_date=res.get('duration', 0))
+            ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
                 res['date'] = ls[1]
                 res['date_deadline'] = ls[2]
@@ -1462,7 +1530,7 @@ true, it will allow you to hide the event alarm information without removing it.
             context = {}
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
-        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
 
         return res
 
@@ -1476,27 +1544,23 @@ true, it will allow you to hide the event alarm information without removing it.
         @return: True
         """
         res = False
-        for id in ids:
-            ls = base_calendar_id2real_id(id)
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                date_new = ls[1]
-                for record in self.read(cr, uid, [base_calendar_id2real_id(id)], \
-                                            ['date', 'rrule', 'exdate']):
-                    if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',') or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
-                        if record['date'] == date_new:
-                            res = self.write(cr, uid, [base_calendar_id2real_id(id)], {'exdate': exdate})
-                    else:
-                        ids = map(lambda x: base_calendar_id2real_id(x), ids)
-                        res = super(calendar_event, self).unlink(cr, uid, \
-                                                base_calendar_id2real_id(ids))
-                        alarm_obj = self.pool.get('res.alarm')
-                        alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
-            else:
-                ids = map(lambda x: base_calendar_id2real_id(x), ids)
-                res = super(calendar_event, self).unlink(cr, uid, ids)
-                alarm_obj = self.pool.get('res.alarm')
-                alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
+        for event_id in ids:
+            if isinstance(event_id, (int, long)):
+                res = super(calendar_event, self).unlink(cr, uid, event_id)
+                self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
+                continue
+            event_id, date_new = event_id.split('-')
+            event_id = [int(event_id)]
+            for record in self.read(cr, uid, event_id, ['date', 'rrule', 'exdate']):
+                if record['rrule']:
+                    # Remove one of the recurrent event 
+                    date_new = time.strftime("%Y-%m-%d %H:%M:%S", \
+                                 time.strptime(date_new, "%Y%m%d%H%M%S"))
+                    exdate = (record['exdate'] and (record['exdate'] + ',') or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
+                    res = self.write(cr, uid, event_id, {'exdate': exdate})
+                else:
+                    res = super(calendar_event, self).unlink(cr, uid, event_id)
+                    self.pool.get('res.alarm').do_alarm_unlink(cr, uid, event_id, self._name)
         return res
 
     def create(self, cr, uid, vals, context=None):
@@ -1513,8 +1577,41 @@ true, it will allow you to hide the event alarm information without removing it.
             context = {}
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
-        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
         return res
+    
+    def do_tentative(self, cr, uid, ids, context=None, *args):
+        """ Makes event invitation as Tentative
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event IDs
+        @param *args: Get Tupple value
+        @param context: A standard dictionary for contextual values 
+        """
+        return self.write(cr, uid, ids, {'state': 'tentative'}, context)
+    
+    def do_cancel(self, cr, uid, ids, context=None, *args):
+        """ Makes event invitation as Tentative
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event IDs
+        @param *args: Get Tupple value
+        @param context: A standard dictionary for contextual values 
+        """
+        return self.write(cr, uid, ids, {'state': 'cancelled'}, context)
+
+    def do_confirm(self, cr, uid, ids, context=None, *args):
+        """ Makes event invitation as Tentative
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Event IDs
+        @param *args: Get Tupple value
+        @param context: A standard dictionary for contextual values 
+        """
+        return self.write(cr, uid, ids, {'state': 'confirmed'}, context)
 
 calendar_event()
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index aa63dc696de..7e2368658df 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -206,7 +206,7 @@
                 <form string="Events">
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
-                            colspan="4" />
+                            colspan="4" required="1" />
                         <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
                         <newline/>
                         <field name="date" string="Start Date" required="1" select="1"
@@ -222,10 +222,15 @@
                                <field name="rrule_type" string="Recurrency"
                                     colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                                <button string="Edit All"
-                                   help="Edit all Ourrences of recurrent Meeting"
+                                   help="Edit all Ourrences of recurrent Events"
                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                    name="open_event" icon="gtk-edit"
                                    type="object" />
+                               <button string="ExRule"
+                                    help="Add Exception Rule"
+                                    name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                    context="{'model' : 'calendar.event'}"
+                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                         </group>
                     </group>
                     <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -284,7 +289,25 @@
                         </group>
                         <separator string="Description" colspan="4" />
                         <field name="description" nolabel="1" colspan="4" />
-                        <separator colspan="4"/>
+                        <separator colspan="4" string="" />
+                           <group col="5" colspan="4">
+                               <field name="state" select="2" />
+                               <button name="do_tentative"
+                                   states="confirmed,cancelled"
+                                   string="Uncertain"
+                                   type="object"
+                                   icon="terp-crm" />
+                               <button name="do_confirm"
+                                   string="Confirm"
+                                   states="tentative,cancelled"
+                                   type="object"
+                                   icon="gtk-apply" />
+                               <button name="do_cancel"
+                                   string="Cancel"
+                                   states="tentative,confirmed"
+                                   type="object"
+                                   icon="gtk-cancel" />
+                           </group>
                         </page>
                         <page string="Invitation Detail">
                             <button string="Invite People"
@@ -350,11 +373,12 @@
             <field name="arch" type="xml">
                 <tree string="Events">
                     <field name="name" string="Subject" />
-                    <field name="date" string="Meeting Date" />
+                    <field name="date" string="Event Date" />
                     <field name="location" />
                     <field name="show_as" />
                     <field name="class" string="Privacy" />
                     <field name="user_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -388,6 +412,10 @@
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
                            <separator orientation="vertical"/>
+                           <filter icon="terp-check" string="Confirmed"
+                               domain="[('state','=','confirmed')]"
+                               help="Confirmed Events" />
+                           <separator orientation="vertical"/>
                            <field name="name" select="1" string="Summary"/>
                            <field name="location" select="1" string="Location"/>
                            <separator orientation="vertical"/>
@@ -398,6 +426,8 @@
                        </group>
                        <newline/>
                         <group expand="0" string="Group By...">
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
                             <filter string="Availability" icon="terp-camera_test"
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index a95b1e1a129..8638226ece7 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,9 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee",base.group_user,1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm",base.group_user,1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm",base.group_user,1,1,1,1
-"access_calendar_event_all","calendar.event","model_calendar_event",base.group_user,1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo",base.group_user,1,1,1,1
-"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",base.group_user,1,1,1,1
-"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",base.group_user,1,1,1,1
-"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",base.group_user,1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
+"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
+"access_calendar_event","calendar.event.user","model_calendar_event","base.group_user",1,1,1,1
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index febfb39e1ef..ab458c8f7f5 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -82,12 +82,11 @@ class base_calendar_set_exrule(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
-
         """
-        crm_obj = self.pool.get('crm.meeting')
-        for meeting in crm_obj.browse(cr, uid, context.get('active_ids', [])):
-            if not meeting.rrule:
-                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency after Apply Exception Rule"))
+        event_obj = self.pool.get(context.get('active_model'))
+        for event in event_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not event.rrule:
+                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency before applying Exception Rule."))
         return False
 
     def compute_exrule_string(self, cr, uid, ids, context=None):
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 2bedf9d15fa..848bed39783 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -26,21 +26,7 @@ class res_partner_contact(osv.osv):
 
     _name = "res.partner.contact"
     _description = "Contact"
-
-    def _title_get(self,cr, user, context={}):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user,
-            @param context: A standard dictionary for contextual values
-        """
-
-        obj = self.pool.get('res.partner.title')
-        ids = obj.search(cr, user, [])
-        res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
-        res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
-        return res
-
+    
     def _main_job(self, cr, uid, ids, fields, arg, context=None):
         """
             @param self: The object pointer
@@ -62,7 +48,7 @@ class res_partner_contact(osv.osv):
         'name': fields.char('Last Name', size=30, required=True),
         'first_name': fields.char('First Name', size=30),
         'mobile': fields.char('Mobile', size=30),
-        'title': fields.selection(_title_get, 'Title'),
+        'title': fields.many2one('res.partner.title','Title'),
         'website': fields.char('Website', size=120),
         'lang_id': fields.many2one('res.lang', 'Language'),
         'job_ids': fields.one2many('res.partner.job', 'contact_id', 'Functions and Addresses'),
@@ -101,13 +87,15 @@ class res_partner_contact(osv.osv):
         if not len(ids):
             return []
         res = []
-        for r in self.read(cr, user, ids, ['name','first_name','title']):
-            addr = r['title'] and str(r['title'])+" " or ''
-            addr += r.get('name', '')
-            if r['name'] and r['first_name']:
-                addr += ' '
-            addr += (r.get('first_name', '') or '')
-            res.append((r['id'], addr))
+        for contact in self.browse(cr, user, ids, context=context):
+            _contact = ""
+            if contact.title:
+                _contact += "%s "%(contact.title.name)
+            _contact += contact.name or ""
+            if contact.name and contact.first_name:
+                _contact += " "
+            _contact += contact.first_name or ""
+            res.append((contact.id, _contact))
         return res
 
 res_partner_contact()
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 2c76b1844e8..40646d1f8eb 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -6,19 +6,19 @@
         <record id="res_partner_contact_mortier0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Mortier&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="title" ref="base.res_partner_title_sir"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_jacot0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Jacot&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_passot0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Thomas&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Passot&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lacarte0" model="res.partner.contact">
@@ -37,25 +37,25 @@
         <record id="res_partner_contact_lavente0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Jean-Guy&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lavente&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lelitre0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Sylvie&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lelitre&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Mss&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Arthur&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Grosbonnet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Karine&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lesbrouffe&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_zen0" model="res.partner.contact">
@@ -66,73 +66,73 @@
             <field eval="&quot;&quot;&quot;http://fptiny.blogspot.com/&quot;&quot;&quot;" name="website"/>
             <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Pinckaers&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_debois0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Marc&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Debois&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_luu0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Phuong&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Luu&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_elkhayat0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Najlaa&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Khayat&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ms.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_madam" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_depaoli0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Quentin&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Paolino&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_semal0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Fabian&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;W.&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_vandewerve0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Yvan&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;van de Werve&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_lambotte0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Henry&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Lambotte&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_laurent0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Olivier&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Laurent&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_simonis0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Christophe&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Dupont&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_wirtel0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Stéphane&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Andre&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_partner_contact_mignon0" model="res.partner.contact">
             <field eval="&quot;&quot;&quot;Philippe&quot;&quot;&quot;" name="first_name"/>
             <field eval="&quot;&quot;&quot;Antoine&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field ref="base.res_partner_title_sir" name="title"/>
             <field eval="1" name="active"/>
         </record>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9050f05acaf..c336b3e35fe 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -29,37 +29,39 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Partner Contact">
-                <field name="name" select="1"/>
-                <field name="first_name" select="1"/>
+                <group colspan="4" col="6">
+                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
+                    <field name="name" select="1"/>
+                    <field name="first_name" select="1"/>
+                </group>
                 <notebook colspan="4" >
-                    <page string="General">
-                        <newline/>
-                        <separator string="General Information" colspan="4"/>
-                       <group string="Partner" colspan="2" col="2">
-                           <field name="partner_id" invisible="1" select="1"/>
-                           <field name="title" select="1"/>
-                           <field name="function" invisible="1"/>
-                        <field name="email"/>
-                           <field name="lang_id"/>
-                           <field name="active"/>
-                       </group>
-                       <group string="Communication" colspan="2" col="2">
-                           <field name="mobile"/>
-                           <field name="email"  widget="email"/>
-                           <field name="website"/>
-                       </group>
+                    <page string="General">                        
+                       <group colspan="4" col="4">
+                            <group colspan="2" col="4">
+                                <separator string="Communication" 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">
-                               <group string="Partner" colspan="2" col="4">
+                               <group colspan="4" col="4">
+                                   <field name="sequence_contact" />
                                    <field name="function"/>
-                                   <field name="address_id"/>
-                                   <field name="name"/>
+                                   <field name="name"/> 
+                                   <field name="address_id"/>                                   
                                    <field name="date_start" />
                                    <field name="date_stop" />
                                    <field name="state" />
-                                   <field name="sequence_contact" />
+                                   
                                </group>
-                               <group string="Communication" colspan="2" col="2">
+                                <separator string="Communication" colspan="4"/>
+                               <group colspan="4" col="4">
                                    <field name="phone"/>
                                    <field name="fax"/>
                                    <field name="email" widget="email"/>
@@ -81,16 +83,18 @@
                             </tree>
                         </field>
                     </page>
-                    <page string="Extra Information">
+                    <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>
-                    <page string="Picture">
-                        <field name="photo" nolabel="1" colspan="2" widget="image"/>
-                    </page>
+                    
                 </notebook>
             </form>
         </field>
@@ -174,13 +178,14 @@
                                 <field name="email"/>
                             </tree>
                             <form string="Contacts">
-                            <group string="Partner" colspan="2" col="2">
+                            <group colspan="4" col="4">
                                 <field name="sequence_partner"/>
                                 <field name="name"/>
                                 <field name="contact_id"/>
                                 <field name="function"/>
                             </group>
-                            <group string="Communication" colspan="2" col="2">
+                            <separator string="Communication" colspan="4"/>
+                            <group colspan="4" col="4">
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
index 5a76e25c424..335f525f92f 100644
--- a/addons/base_contact/test/base_contact00.yml
+++ b/addons/base_contact/test/base_contact00.yml
@@ -10,7 +10,7 @@
     !record {model: res.lang, id: res_lang_french0}:
       code: fr_BE
       date_format: '%m/%d/%Y'
-      decimal_point: .
+      decimal_point: '.'
       direction: ltr
       grouping: '[]'
       name: French
@@ -30,7 +30,6 @@
         lang_id: res_lang_french0
         mobile: (+32).10.45.18.77
         name: Williams
-        title: Mss
 -   |
     Now in order to assign this contact to partner I will create one partner assign contact laura to this partner
 - 
@@ -51,7 +50,7 @@
         lang: fr_BE
         name: Laura's Company
         ref: LC
-        title: ltd
+
 -   |
     Now I will check that the new job is assigned properly to contact or not
 -
@@ -74,7 +73,7 @@
         lang_id: res_lang_french0
         mobile: (+32).23.44.32.12
         name: Pauwels
-        title: M.
+
 -   |
     In order to check one contact working at one partner with different functions
     I will create contact with 2 different jobs with different function but the same address
@@ -92,5 +91,4 @@
     lang_id: base_contact.res_lang_french0
     mobile: (+32).10.45.18.77
     name: Mortier
-    title: Mss
 
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index a22e6935e51..24e5a1c4cee 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -2,5 +2,3 @@
 "access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
 "access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
 "access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
-"access_report_menu_create","report.menu.create","model_report_menu_create","base.group_system",1,1,1,1
-"access_report_open","report.open","model_report_open","base.group_system",1,1,1,1
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 6608cea061b..bb9f8d23bf7 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -31,7 +31,7 @@
             <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="profile_association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 0ab47197d66..c95fa98d8fc 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -78,7 +78,7 @@ class base_setup_installer(osv.osv_memory):
         'product_expiry':fields.boolean('Food Industry',
             help="Installs a preselected set of OpenERP "
                  "applications which will help you manage foods."),
-        'profile_association':fields.boolean('Associations',
+        'association':fields.boolean('Associations',
             help="Installs a preselected set of OpenERP "
                  "applications which will help you manage your association "
                  "more efficiently."),
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
index 9cc4e8bda68..97dd8b917b8 100644
--- a/addons/base_setup/security/ir.model.access.csv
+++ b/addons/base_setup/security/ir.model.access.csv
@@ -1,4 +1 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-"access_base_setup_installer","base.setup.installer","model_base_setup_installer",base.group_system,1,1,1,1
-"access_base_setup_company","base.setup.company","model_base_setup_company",base.group_system,1,1,1,1
-"access_base_setup_config","base.setup.config","model_base_setup_config",base.group_system,1,1,1,1
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index a1dd41ae5ae..c7e1a37b8fa 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -3,6 +3,8 @@
     <data>
         <menuitem icon="terp-graph" id="base.reporting_menu"
             name="Reporting" sequence="30" />
+        <menuitem icon="terp-graph" id="menu_dasboard"
+            name="Dashboard" sequence="30" />
 
  <!--Board Note Tree View  -->
 
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index a9c42feda41..6788173d3e2 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -3,4 +3,3 @@
 "access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
-"access_board_menu_create","board.menu.create","model_board_menu_create","base.group_user",1,1,1,1
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4c1003023ae..d1cb79a0e4a 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -53,11 +53,11 @@
         <field name="view_id" ref="view_calendar_collection_form"/>
         <field name="act_window_id" ref="action_calendar_collection_form"/>
     </record>
-    
-    <menuitem        
+
+    <menuitem
         id="menu_calendar"
         name="Calendar"
-        parent="base.menu_document_configuration"/>
+        parent="knowledge.menu_document_configuration"/>
 
     <menuitem
         action="action_calendar_collection_form"
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 3e4701a08d5..c9f40e418a1 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -117,7 +117,7 @@ def get_attribute_mapping(cr, uid, calname, context={}):
         res['uid']['type'] = "integer"
     return res
 
-def map_data(cr, uid, obj):
+def map_data(cr, uid, obj, context=None):
     """ Map Data
         @param self: The object pointer
         @param cr: the current row, from the database cursor,"""
@@ -144,7 +144,7 @@ def map_data(cr, uid, obj):
                 model = obj.__attribute__[map_dict].get('object', False)
                 modobj = obj.pool.get(model)
                 for map_vall in map_val:
-                    id = modobj.create(cr, uid, map_vall)
+                    id = modobj.create(cr, uid, map_vall, context=context)
                     ids.append(id)
                 vals[field] = [(6, 0, ids)]
                 continue
@@ -155,7 +155,15 @@ def map_data(cr, uid, obj):
                     continue
                 model = obj.__attribute__[map_dict].get('object', False)
                 modobj = obj.pool.get(model)
-                id = modobj.create(cr, uid, map_val)
+                # check if the record exists or not
+                key1 = map_val.keys()
+                value1 = map_val.values()
+                domain = [(key1[i], '=', value1[i]) for i in range(len(key1)) if value1[i]]
+                exist_id = modobj.search(cr, uid, domain, context=context)
+                if exist_id:
+                    id = exist_id[0]
+                else:
+                    id = modobj.create(cr, uid, map_val, context=context)
                 vals[field] = id
                 continue
             if field_type == 'timedelta':
@@ -245,7 +253,7 @@ class CalDAV(object):
                 if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
                     self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
                 self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
-        vals = map_data(cr, uid, self)
+        vals = map_data(cr, uid, self, context=context)
         return vals
 
     def create_ics(self, cr, uid, datas, name, ical, context=None):
@@ -277,11 +285,7 @@ class CalDAV(object):
                                            % (model_obj._table, data[map_field]))
                             r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids:
-                            rdata = self.pool.get(model).read(cr, uid, r_ids)
-                            event_obj = self.pool.get('basic.calendar.event')
-                            rcal = event_obj.export_cal(cr, uid, rdata, context=context)
-                            for revents in rcal.contents['vevent']:
-                                ical.contents['vevent'].append(revents)
+                            rcal = self.export_cal(cr, uid, r_ids, 'vevent', context=context)
                         if data.get('recurrent_uid', None):
                             uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
                         vevent.add('uid').value = uidval
@@ -878,7 +882,7 @@ class Timezone(CalDAV, osv.osv_memory):
             if child.name.lower() == 'tzid':
                 tzname = child.value
                 self.ical_set(child.name.lower(), tzname, 'value')
-        vals = map_data(cr, uid, self)
+        vals = map_data(cr, uid, self, context=context)
         return vals
 
 Timezone()
@@ -973,7 +977,7 @@ class Alarm(CalDAV, osv.osv_memory):
                         self.ical_set('trigger_related', child.params.get('related')[0].lower(), 'value')
             else:
                 self.ical_set(child.name.lower(), child.value.lower(), 'value')
-        vals = map_data(cr, uid, self)
+        vals = map_data(cr, uid, self, context=context)
         return vals
 
 Alarm()
@@ -1017,7 +1021,7 @@ class Attendee(CalDAV, osv.osv_memory):
                 self.ical_set(para.lower(), ical_data.params[para][0].lower(), 'value')
         if not ical_data.params.get('CN'):
             self.ical_set('cn', ical_data.value, 'value')
-        vals = map_data(cr, uid, self)
+        vals = map_data(cr, uid, self, context=context)
         return vals
 
     def export_cal(self, cr, uid, model, attendee_ids, vevent, context={}):
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index fa7b85a39f1..bb16603b904 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -1,13 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event","base.group_user",1,1,1,0
-"access_basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee","base.group_user",1,1,1,0
-"access_calendar_todo_all","basic.calendar.todo","model_basic_calendar_todo","base.group_user",1,1,1,0
-"access_basic_calendar_alarm_all","basic.calendar.alarm","model_basic_calendar_alarm","base.group_user",1,1,1,1
 "access_basic_calendar_lines","basic.calendar.lines","model_basic_calendar_lines","base.group_user",1,1,1,1
 "access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
 "access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
-"access_basic_calendar_timezone","basic.calendar.timezone","model_basic_calendar_timezone","base.group_user",1,1,1,1
-"access_calendar_event_export","calendar.event.export","model_calendar_event_export","base.group_user",1,1,1,1
-"access_calendar_event_import","calendar.event.import","model_calendar_event_import","base.group_user",1,1,1,1
-"access_calendar_event_subscribe","calendar.event.subscribe","model_calendar_event_subscribe","base.group_user",1,1,1,1
 "access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 6e7a8edb807..973bb12dc5c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -70,6 +70,9 @@ Create dashboard for CRM that includes:
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
+        'security/crm_security.xml',
+        'security/ir.model.access.csv',
+
         'wizard/crm_lead_to_partner_view.xml',
         'wizard/crm_lead_to_opportunity_view.xml',
 
@@ -97,9 +100,6 @@ Create dashboard for CRM that includes:
         'crm_opportunity_view.xml',
         'crm_opportunity_menu.xml',
 
-        'security/crm_security.xml',
-        'security/ir.model.access.csv',
-
         'report/crm_lead_report_view.xml',
         'report/crm_phonecall_report_view.xml',
 
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 0851a32ad66..1baf673990d 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -96,11 +96,12 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
+	    <menuitem icon="terp-graph" id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
 
         <menuitem
-            name="Statistics Dashboard" parent="menu_board_crm_config"
+            name="Statistics Dashboard" parent="board.menu_dasboard"
             action="open_board_statistical_dash"
-            sequence="2"
+            sequence="0"
             id="menu_board_statistics_dash"
             icon="terp-graph"/>
 
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 4729ab7283d..c90ecb28e03 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -89,14 +89,9 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-     	<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-     	        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+	    <menuitem icon="terp-graph" id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
-            name="CRM Configuration" parent="base.dashboard"
-            id="menu_board_crm_config"
-            groups="crm.group_crm_manager"/>
-        <menuitem
-            name="Connecting Dashboard" parent="menu_board_crm_config"
+            name="Connecting Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
             sequence="1"
             id="menu_board_crm" icon="terp-graph"/>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c46519cdb97..5bd0e01c113 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -214,7 +214,7 @@ class crm_case(object):
 
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
         mailgate_pool = self.pool.get('mailgate.thread')
-        return mailgate_pool._history(cr, uid, cases, keyword, history=history,\
+        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \
                                        details=details, email_from=email_from,\
                                        message_id=message_id, attach=attach, \
@@ -367,7 +367,6 @@ class crm_case(object):
                         body += '\n\n%s' % (case.user_id.signature)
 
                 body = self.format_body(body)
-                dest = [dest]
 
                 attach_to_send = None
 
@@ -377,20 +376,17 @@ class crm_case(object):
                     attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
 
                 # Send an email
+                subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
                 flag = tools.email_send(
                     src,
-                    dest,
-                    "Reminder: [%s] %s" % (str(case.id), case.name, ),
+                    [dest],
+                    subject, 
                     body,
                     reply_to=case.section_id.reply_to,
                     openobject_id=str(case.id),
                     attach=attach_to_send
                 )
-                self._history(cr, uid, [case], _('Send'), history=True, email=dest, details=body, email_from=src)
-                #if flag:
-                #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
-                #else:
-                #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
+                self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
         return True
 
     def _check(self, cr, uid, ids=False, context={}):
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index e494db325e5..60af74e9359 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 379644e72b1..c429810e31f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -5,7 +5,7 @@
     <!--Lead Stage Form view -->
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
-        <field name="name">Lead Stages</field>
+        <field name="name">Stages</field>
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
@@ -19,9 +19,8 @@
 
 
         <!--  Resource Type Form View -->
-
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
-            <field name="name">Lead Resource Type</field>
+            <field name="name">Lead Sources</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
@@ -30,12 +29,11 @@
         </record>
 
       <menuitem action="crm_lead_resource_act"
-            id="menu_crm_lead_resource_act" name="Resource Type"
+            id="menu_crm_lead_resource_act" name="Lead Sources"
             groups="base.group_extended" sequence="2"
             parent="menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
-
         <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
         <field name="model">crm.lead</field>
@@ -159,16 +157,17 @@
                  </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
+                       <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
                    </group>
                     <!-- TODO-->
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="6" colspan="4">
+                            <group col="4" colspan="4">
                                 <field name="email_from"/>
-                                <field name="email_to"/>
                                 <field name="date"/>
-                                <field name="name" colspan="6"/>
+                                <field name="email_to" widget="char" size="512"/>
+                                <field name="email_cc" widget="char" size="512"/>
+                                <field name="name" colspan="4" widget="char" size="512"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Details">
@@ -179,7 +178,7 @@
                                 </page>
                             </notebook>
                             <button colspan="4"
-                            string="Reply to Last Email"
+                            string="Reply"
                             name="%(crm.action_crm_send_mail)d"
                             context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                             icon="gtk-undo" type="action" />
@@ -226,9 +225,9 @@
                 <field name="referred" invisible="1"/>
 
                 <field name="stage_id"/>
-                <button name="stage_previous" string="Previous"
+                <button name="stage_previous" string="Previous Stage"
                     states="open,pending" type="object" icon="gtk-go-back" />
-                <button name="stage_next" string="Next"
+                <button name="stage_next" string="Next Stage"
                     states="open,pending" type="object"
                     icon="gtk-go-forward" />
                 <field name="section_id" invisible="context.get('invisible_section', True)" />
@@ -292,13 +291,11 @@
 
                 <separator orientation="vertical"/>
                 <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
-                            ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                    help="Todays' Opportunities" />
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                    help="Todays' Leads" />
                 <filter icon="terp-go-week" string="7 Days"
-                    help="Opportunities during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                     ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    help="Leads creating during last 7 days"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                 />
                 <separator orientation="vertical"/>
                 <field name="name"/>
@@ -314,7 +311,7 @@
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
-                        help="My Sale Team"/>
+                        help="My Sales Team"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5d1bb3f29d7..e635a1d26bc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,9 +51,10 @@
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
                            <button string="ExRule"
-               name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-               context="{'model' : 'crm.meeting'}"
-               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+                                help="Add Exception Rule"
+                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                context="{'model' : 'crm.meeting'}"
+                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 7e0042f8944..ea959f7bd1a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -1,54 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
-        <!-- Opportunity Categories Form View -->
-
-        <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
-            <field name="name">Opportunity Categories</field>
-            <field name="res_model">crm.case.categ</field>
-            <field name="view_type">form</field>
-            <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-            <field name="context">{'object_id':'crm.lead'}</field>
-        </record>
-
-        <menuitem action="crm_opportunity_categ_action"
-            id="menu_crm_case_opportunity-act" name="Categories"
-            parent="menu_crm_config_opportunity" sequence="1"/>
-
-        <!-- Opportunity Stages Form View-->
-
-        <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
-            <field name="name">Opportunity Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-             <field name="context">{'object_id':'crm.lead'}</field>
-        </record>
-
-        <menuitem action="crm_opportunity_stage_act"
-            id="menu_crm_opportunity_stage_act" name="Stages"
-            parent="menu_crm_config_opportunity" sequence="2"/>
-
-        <!-- Opportunity Resource Type Form View -->
-
-        <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
-            <field name="name">Opportunity Resource Type</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-             <field name="context">{'object_id':'crm.lead'}</field>
-        </record>
-
-        <menuitem action="crm_opportunity_resource_act"
-            id="menu_crm_opportunity_resource_act" name="Resource"
-            parent="menu_crm_config_opportunity" sequence="3"/>
-
         <!-- Opportunities Form View -->
-
             <record model="ir.ui.view" id="crm_case_form_view_oppor">
                 <field name="name">Opportunities</field>
                 <field name="model">crm.lead</field>
@@ -149,11 +102,13 @@
                                 <field name="country_id"/>
                                 <field name="state_id"/>
                             </group>
-                            <group colspan="2" col="3">
-                                <separator string="Communication" colspan="4" col="3"/>
+                            <group colspan="2" col="2">
+                                <separator string="Communication" colspan="2"/>
                                 <field name="fax"/>
-                                <newline/>
                                 <field name="mobile"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Mailings" colspan="2"/>
                                 <field name="optin"/>
                                 <field name="optout"/>
                             </group>
@@ -161,14 +116,16 @@
 
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="CC"/>
+                                <field colspan="4" name="email_cc" string="Cc" widget="char" size="512"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
                                 <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
+                                    <group col="4" colspan="4">
                                         <field name="email_from"/>
+                                        <field name="date"/>
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="name" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
@@ -251,9 +208,9 @@
                         <field name="country_id" invisible="context.get('invisible_country', True)" />
                         <field name="date_action"/>
                         <field name="stage_id"/>
-                        <button name="stage_previous" string="Previous"
+                        <button name="stage_previous" string="Previous Stage"
                             states="open,pending" type="object" icon="gtk-go-back" />
-                        <button name="stage_next" string="Next"
+                        <button name="stage_next" string="Next Stage"
                             states="open,pending" type="object"
                             icon="gtk-go-forward" />
                         <field name="planned_revenue" sum="Total of Planned Revenue"/>
@@ -315,12 +272,11 @@
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
                             help="Todays' Opportunities" />
                         <filter icon="terp-go-week" string="7 Days"
-                            help="Opportunities during last 7 days"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                                ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Opportunities created during last 7 days"
+                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                         />
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
@@ -329,6 +285,7 @@
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
                         </field>
+                        <field name="email_from"/>
                         <field name="section_id"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}"
@@ -336,7 +293,7 @@
                             <filter icon="terp-personal+"
                                 domain="[('section_id.user_id','=',uid)]"
                                 context="{'invisible_section': False}"
-                                help="My Sale Team" />
+                                help="My Sales Team" />
                             <filter icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[]"
@@ -360,6 +317,7 @@
                         <group expand="0" string="Group By..." colspan="16">
                             <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="Priority" icon="terp-rating-rated" domain="[]"
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
@@ -368,6 +326,7 @@
                             <separator orientation="vertical" />
                             <filter string="Salesman" icon="terp-personal"
                                 domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                             <separator orientation="vertical" />
                             <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 6c5472afa99..9beb4f4c0c4 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -67,7 +67,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context">{'set_editable':True,'default_state':'open','search_default_current':1,'search_default_today':1}</field>
+        <field name="context" eval="'{\'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -103,7 +103,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
-        <field name="context">{'default_state':'open','search_default_current':1}</field>
+        <field name="context" eval="'{\'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index bb143964d70..479e73fe8fb 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -204,8 +204,11 @@
             <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
                 <field name="date" string="Date"/>
                 <field name="name" string="Call Summary"/>
-                <field name="partner_id" string="Partner"/>
-                <field name="partner_contact"/>
+                <field name="partner_id"
+                	on_change="onchange_partner_id(partner_id, email_from)"
+                	string="Partner" />
+                <field name="partner_address_id" string="Contact"
+                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="state" invisible="1"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b196d9cb4ca..a3d9f14273e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <menuitem id="base.menu_crm_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="1"/>
 
-        <menuitem id="menu_crm_config_lead" name="Lead"
+        <menuitem id="menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_crm_config_sales" sequence="0" groups="base.group_extended"/>
 
-        <menuitem id="menu_crm_config_opportunity" name="Opportunity"
-            parent="base.menu_crm_config_sales" sequence="1"/>
-
         <menuitem id="menu_crm_config_meeting" name="Meeting"
             parent="base.menu_base_config" sequence="4"/>
 
@@ -76,11 +74,16 @@
         <!-- Case Sections Action -->
 
         <record id="crm_case_section_act" model="ir.actions.act_window">
-            <field name="name">Sales Team</field>
+            <field name="name">Sales Teams</field>
             <field name="res_model">crm.case.section</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
+        
+        <menuitem action="crm_case_section_act"
+            id="menu_crm_case_section_act" sequence="4"
+            parent="menu_crm_config_lead" />
+            
 
         <!-- CRM Stage Tree View -->
 
@@ -166,12 +169,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-
-        <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act" sequence="4"
-            parent="menu_crm_config_opportunity" />
-
-
+        
+         <menuitem action="crm_case_categ-act"
+            id="menu_crm_case_categ-act" name="Categories"
+            parent="menu_crm_config_lead" sequence="1"/>
 
         <!-- Resource Type of case Tree View -->
 
@@ -338,14 +339,14 @@
         </record>
 
         <record id="crm_segmentation-act" model="ir.actions.act_window">
-            <field name="name">Segmentations</field>
+            <field name="name">Segmentation</field>
             <field name="res_model">crm.segmentation</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_segmentation-view"/>
         </record>
 
         <record id="crm_segmentation_tree-act" model="ir.actions.act_window">
-            <field name="name">Segmentations</field>
+            <field name="name">Segmentation</field>
             <field name="res_model">crm.segmentation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -353,8 +354,8 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="5"
-            parent="menu_crm_config_opportunity" />
+            groups="base.group_extended" sequence="3"
+            parent="base.menu_config_address_book" />
 
         <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/es.po b/addons/crm/i18n/es.po
index 98802efa85d..fa1b967cea8 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-06-27 22:27+0000\n"
+"PO-Revision-Date: 2010-06-28 22:26+0000\n"
 "Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2239,7 +2239,7 @@ msgstr "Creado"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Information"
-msgstr ""
+msgstr "Información iniciativa"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2264,6 +2264,8 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Le ayuda a registrar el resultado de una llamada telefónica o planear una "
+"lista de llamadas a procesar."
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
@@ -2278,7 +2280,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -2559,6 +2561,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Si el campo activo está establecido a verdadero, le permitirá ocultar el "
+"caso sin eliminarlo."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
@@ -2637,7 +2641,7 @@ msgstr "Para asignar"
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Por favor, ¡provea una URL adecuada!"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -2764,7 +2768,7 @@ msgstr "Abierto"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PUBLIC"
-msgstr ""
+msgstr "PÚBLICO"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -2783,6 +2787,8 @@ msgstr "Casos llamadas"
 #: help:crm.case.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of case rules."
 msgstr ""
+"Establece el orden de secuencia cuando se muestra una lista de reglas de "
+"casos."
 
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
@@ -2845,7 +2851,7 @@ msgstr "Nombre iniciativa"
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Descripción Reclamación/Acción"
 
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
@@ -2855,7 +2861,7 @@ msgstr "Máximo historial de comunicaciones"
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Reunión para generación de iniciativas"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
@@ -2907,6 +2913,14 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"El estado se establece a 'Borrador', cuando se crea un caso.                 "
+"                 \n"
+"Si el caso está en progreso el estado se establece a 'Abierto'.              "
+"                    \n"
+"Cuando el caso se cierra, el estado se establece a 'Realizado'.              "
+"                    \n"
+"Si el caso necesita ser revisado entonces en estado se establece a "
+"'Pendiente'."
 
 #. module: crm
 #: view:crm.job:0
@@ -2951,12 +2965,12 @@ msgstr "Usuario responsable"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "¡Correo no enviado!"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "Cerrar llamada"
 
 #. module: crm
 #: field:crm.case,email_last:0
@@ -2966,12 +2980,12 @@ msgstr "Último email"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Communication History"
-msgstr ""
+msgstr "Exp. reg. en histórico de comunicaciones"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Borrador demanda"
 
 #. module: crm
 #: field:crm.case,id:0
@@ -2987,12 +3001,12 @@ msgstr "Historial del registro"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Resumen oportunidad"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Search Case"
-msgstr ""
+msgstr "Buscar caso"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3008,7 +3022,7 @@ msgstr "Descripción del caso"
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Asignar a"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -3018,7 +3032,7 @@ msgstr "Última acción"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duración"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
@@ -3028,12 +3042,12 @@ msgstr "Casos por sección, categoría y fase"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Candidato contratado"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Proceso de selección de personal"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
@@ -3044,12 +3058,12 @@ msgstr "Todos los casos"
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Una empresa ya ha sido definida en esta iniciativa."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Origen iniciativa"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -3057,17 +3071,17 @@ msgstr ""
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PRIVATE"
-msgstr ""
+msgstr "PRIVADO"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "Provea un camino para el calendario remoto"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3078,28 +3092,28 @@ msgstr "Segmentación"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Formulario fondos"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Buscar reuniones"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Crear una nueva empresa"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "En curso"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3115,18 +3129,18 @@ msgstr "%(case_user)s = Nombre del responsable"
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Objetivos"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Casos por sección y tipo"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Servicios post-venta"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3134,17 +3148,17 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nombre fichero"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Buscar iniciativas"
 
 #. module: crm
 #: help:crm.case.rule,active:0
@@ -3152,6 +3166,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case rule "
 "without removing it."
 msgstr ""
+"Si el campo activo está establecido a verdadero, le permitirá ocultar la "
+"regla de caso sin eliminarla."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3163,13 +3179,13 @@ msgstr "¡Error!"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
 msgid "crm.claim.assign_wizard"
-msgstr ""
+msgstr "crm.reclamación.asistente_asignación"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Todas las peticiones de trabajo"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3181,12 +3197,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Trabajo solicitado"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -3194,31 +3210,33 @@ msgid ""
 "defines a rule or repeating pattern                                 for "
 "anexception to a recurrence set"
 msgstr ""
+"define una regla o patrón repetitivo para una excepción a un conjunto "
+"recurrente"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Relevante"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Nombre oportunidad"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrente"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importar ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Resumen de llamadas"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3233,7 +3251,7 @@ msgstr "Historial de comunicación del caso"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Casos por oportunidades y tipo"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3266,18 +3284,18 @@ msgstr "Expresión opcional"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Rehabilitación social y recuperación rural"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Una empresa ya está definida para esta petición de trabajo"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3301,12 +3319,12 @@ msgstr "Canal"
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Email-id de las personas a las que se mandará el correo"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
 msgid "Claim Cases"
-msgstr ""
+msgstr "Casos de reclamaciones"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3321,22 +3339,22 @@ msgstr "Casos por iniciativas y fase"
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Fecha/horas excepción"
 
 #. module: crm
 #: view:crm.meeting.generic_wizard:0
 msgid "Generic Wizard"
-msgstr ""
+msgstr "Asistente genérico"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Creando oportunidades de negocio desde iniciativas"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Informes"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3362,12 +3380,12 @@ msgstr "Pendiente"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Oportunidad de prospección"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Salario esperado"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3377,54 +3395,54 @@ msgstr "Configuración"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Enviar nuevo correo"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Argumentos inválidos"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
 msgid "Trensparent"
-msgstr ""
+msgstr "Transparente"
 
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "Mis casos"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "De palabra"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Subject"
-msgstr ""
+msgstr "Asunto iniciativa"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Convertir a oportunidad"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Planificado"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Oficina cliente"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "Email candidato"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -3434,7 +3452,7 @@ msgstr "Fase de ventas: "
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Tipo de acción"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3444,7 +3462,7 @@ msgstr "Establecer responsable a"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Reunión con candidatos"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3468,12 +3486,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Search Cases by User"
-msgstr ""
+msgstr "Buscar casos por usuario"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3488,7 +3506,7 @@ msgstr "Enviar correo a empresa"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Árbol de fondos"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3498,7 +3516,7 @@ msgstr "Método llamada al objeto"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Todos los fondos"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
@@ -3510,12 +3528,12 @@ msgstr "Calendario"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Comercial"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "Ayuda/Asistencia"
 
 #. module: crm
 #: field:crm.case,ref2:0
@@ -3532,12 +3550,12 @@ msgstr "Compra Ventas"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Programar reunión"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Arte y cultura"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3545,7 +3563,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Saliente"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3556,7 +3574,7 @@ msgstr "Añadir al historial"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3568,7 +3586,7 @@ msgstr "No ejecutado"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Probabilidad de éxito"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3593,7 +3611,7 @@ msgstr "Demora después fecha del disparo"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Details"
-msgstr ""
+msgstr "Detalles iniciativa"
 
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
@@ -3623,17 +3641,17 @@ msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Debería verificar que esta empresa no exista ya."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "Cualificación"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Change RRule"
-msgstr ""
+msgstr "Cambiar regla"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3643,14 +3661,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Casos por sección, categoría y tipo"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3658,12 +3676,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "Licenciado"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -3679,7 +3697,7 @@ msgstr "Sección padre"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Planificar llamada telefónica"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3696,12 +3714,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Contrato"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -3716,7 +3734,7 @@ msgstr "Ingresos previstos"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Servicios sanitarios"
 
 #. module: crm
 #: view:crm.case:0
@@ -3730,7 +3748,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Asignar"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3740,12 +3758,12 @@ msgstr "Contacto empresa"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Oficina"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
 msgid "Fund Raising Cases"
-msgstr ""
+msgstr "Casos de reunión de fondos"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -3774,7 +3792,7 @@ msgstr "Cerrado"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
 msgid "crm.helpdesk.assign_wizard"
-msgstr ""
+msgstr "crm.asistencia.aistente_asignación"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3790,28 +3808,28 @@ msgstr "Código de sección"
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Fecha reunión"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "CONFIDENCIAL"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Contenido del correo"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "No corregido"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: crm
 #: field:crm.case,email_from:0
@@ -3821,7 +3839,7 @@ msgstr "Email empresa"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = EL '%' caracter"
 
 #. module: crm
 #: view:crm.case:0
@@ -3842,12 +3860,12 @@ msgstr "Descripción"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas internas"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
@@ -3867,7 +3885,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3877,7 +3895,7 @@ msgstr "Obligatorio / Opcional"
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importar"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3910,14 +3928,14 @@ msgstr "Muy bajo"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Planificar una reunión"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3937,7 +3955,7 @@ msgstr ""
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Envío masivo de correo"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3950,22 +3968,22 @@ msgstr "Acciones de Email"
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Efectivo"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondos por categorías"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Primer contacto con nueva prospección"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3973,22 +3991,22 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Futuro"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Guardar archivo ICS"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Provea una ruta para el calendario remoto"
 
 #. module: crm
 #: view:crm.case.log:0
@@ -4003,12 +4021,12 @@ msgstr "Condiciones sobre temporización"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
 msgid "Helpdesk Cases"
-msgstr ""
+msgstr "Casos de asistencia"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "Exportar archivo ICS"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
@@ -4021,12 +4039,12 @@ msgstr "Secuencia"
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Exportar archivo ICS"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importar mensaje"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -4042,17 +4060,17 @@ msgstr "Casos por sección"
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "Nuevos trabajos"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Operaciones de obtención de fondos"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Boletín de noticias"
 
 #~ msgid "My Draft "
 #~ msgstr "Mis borradores "
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index f9c39c92403..f7cd5bae694 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -51,7 +51,7 @@ class crm_lead_report(osv.osv):
         for case in self.browse(cr, uid, ids, context):
             if field_name != 'avg_answers':
                 state = field_name[5:]
-                cr.execute("select count(*) from crm_opportunity where \
+                cr.execute("select count(id) from crm_opportunity where \
                     section_id =%s and state='%s'"%(case.section_id.id, state))
                 state_cases = cr.fetchone()[0]
                 perc_state = (state_cases / float(case.nbr)) * 100
@@ -64,7 +64,7 @@ class crm_lead_report(osv.osv):
                 else:
                     model_name = model_name[1]
 
-                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                    cr.execute("select count(id) from crm_case_log l, ir_model m \
                          where l.model_id=m.id and m.model = '%s'" , model_name)
                     logs = cr.fetchone()[0]
 
@@ -90,7 +90,7 @@ class crm_lead_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'email': fields.integer('# of Emails', size=128, readonly=True),
+        'email': fields.integer('# Emails', size=128, readonly=True),
         'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
@@ -120,60 +120,39 @@ class crm_lead_report(osv.osv):
             CRM Lead Report
             @param cr: the current row, from the database cursor
         """
-
         tools.drop_view_if_exists(cr, 'crm_lead_report')
         cr.execute("""
-            create or replace view crm_lead_report as (
-                select
-                    min(c.id) as id,
+            CREATE OR REPLACE VIEW crm_lead_report AS (
+                SELECT
+                    id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
-                    c.state as state,
+                    c.state,
                     c.user_id,
                     c.probability,
                     c.stage_id,
-                    c.type as type,
+                    c.type,
                     c.company_id,
                     c.priority,
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
                     c.planned_revenue,
-                    (select 1) as nbr,
+                    1 as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    (select count(id) from mailgate_message where res_id=c.id and model='crm.lead') as email,
+                    (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id) AS email,
                     date_trunc('day',c.create_date) as create_date,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
-                    avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24) as  delay_expected,
-                    avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open
-                from
+                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected,
+                    extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
+                FROM
                     crm_lead c
-                group by
-                    to_char(c.create_date, 'YYYY'),
-                    to_char(c.date_open, 'YYYY-MM-DD'),
-                    to_char(c.date_closed, 'YYYY-mm-dd'),
-                    to_char(c.create_date, 'MM'),
-                    c.state,
-                    c.user_id,
-                    c.id,
-                    c.section_id,
-                    c.stage_id,
-                    c.probability,
-                    c.categ_id,
-                    c.partner_id,
-                    c.planned_revenue,
-                    c.company_id,
-                    c.priority,
-                    c.type,
-                    c.create_date,
-                    to_char(c.create_date, 'YYYY-MM-DD')
-
             )""")
 
 crm_lead_report()
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c20ea9b48b9..1372553a7b7 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -222,6 +222,7 @@
        </record>
 
        <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"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index c0e666e4eaa..25e62fb2342 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -114,12 +114,11 @@ class crm_phonecall_report(osv.osv):
         """ Phone Calls By User And Section
             @param cr: the current row, from the database cursor,
         """
-
         tools.drop_view_if_exists(cr, 'crm_phonecall_report')
         cr.execute("""
             create or replace view crm_phonecall_report as (
                 select
-                    min(c.id) as id,
+                    id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
@@ -135,33 +134,16 @@ class crm_phonecall_report(osv.osv):
                     c.duration,
                     c.company_id,
                     c.priority,
-                    (select 1) as nbr,
+                    1 as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
                     date_trunc('day',c.create_date) as create_date,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
-                    avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open
-                    
+                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
                 from
                     crm_phonecall c
-                where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2'))
-                group by 
-                    to_char(c.create_date, 'YYYY'),
-                    to_char(c.create_date, 'MM'),\
-                    c.state,
-                    c.user_id,
-                    c.section_id,
-                    c.categ_id,
-                    c.partner_id,
-                    c.company_id,
-                    c.duration,
-                    c.priority,
-                    to_char(c.date_open, 'YYYY-MM-DD'),
-                    to_char(c.date_closed, 'YYYY-mm-dd'),
-                    c.stage_id,
-                    to_char(c.create_date, 'YYYY-MM-DD'),
-                    c.create_date
+                where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2') and model = 'crm.case.categ')
             )""")
 
 crm_phonecall_report()
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index c0f812886cf..0f06a5acacb 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -188,6 +188,7 @@
         </record>
 
         <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"/>
 
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8799dc7aa2c..d72847c44e3 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -9,14 +9,14 @@
     <record id="group_crm_user" model="res.groups">
         <field name="name">CRM / User</field>
     </record>
-<!---->
-<!--    <record model='ir.ui.menu' id='menu_crm'>-->
-<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>-->
-<!--    </record>-->
 
-<!--    <record model='ir.ui.menu' id='menu_crm_configuration'>-->
-<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>-->
-<!--    </record>-->
+    <record model='ir.ui.menu' id='base.menu_base_partner'>
+        <field name="groups_id" eval="[(4,ref('group_crm_manager')),(4,ref('group_crm_user'))]"/>
+    </record>
+
+    <record model="ir.ui.menu" id="base.menu_base_config">
+        <field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 3d9921db9ec..bd881630aff 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -4,9 +4,13 @@
 "access_crm_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1
 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1
 "access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0
+"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","crm.group_crm_manager",1,1,1,1
+"access_crm_lead_manager","crm.lead.manager","model_crm_lead","crm.group_crm_manager",1,1,1,1
+"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1
-"access_crm_meeting_all","crm.meeting"_allll,"model_crm_meeting","base.group_user",1,0,0,0
+"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1
 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1
@@ -19,12 +23,17 @@
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
 "access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1
+"access_crm_lead_report_user","crm.lead.report.user","model_crm_lead_report","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
 "access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","crm.group_crm_manager",1,0,0,0
 "access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_manager",1,0,0,0
-"access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
-"access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1
-"access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
-"access_crm_installer","crm.installer.rule","model_crm_installer","base.group_system",1,1,1,1
+"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","crm.group_crm_manager",1,0,1,0
+"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","crm.group_crm_manager",1,0,1,0
+"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","crm.group_crm_manager",1,0,0,0
+"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","crm.group_crm_manager",1,1,1,1
+"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","crm.group_crm_manager",1,1,1,1
+"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","crm.group_crm_user",1,1,1,0
+"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","crm.group_crm_manager",1,1,1,1
 "access_res_partner","res.partner.crm.user","base.model_res_partner","crm.group_crm_user",1,0,0,0
 "access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","crm.group_crm_user",1,0,0,0
 "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 13706c7bb17..97c54b5ef2b 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -29,7 +29,6 @@
      mobile: (333) 715-1450
      section_id: crm.section_sales_department
      referred: False
-     title: M.
 -  |
    I check that the lead is in 'draft' state, 
 -    
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index f6f43ed7f38..fb607eefdbc 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -125,7 +125,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         msg_val = ''
         model_pool = self.pool.get('crm.lead')
-        print history_type
         if history_type == 'info':
             msg_val = self.get_lead_details(cr, uid, res_id, context=context)
 
@@ -188,7 +187,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         this = self.browse(cr, uid, ids[0], context=context)
 
-        smtp_pool = self.pool.get('email.smtpclient')
         case_pool = self.pool.get(model)
         case = case_pool.browse(cr, uid, res_id, context=context)
 
@@ -206,6 +204,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             if this.history == 'latest':
                 msgs = msgs[:1]
             attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
+        attach = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
 
         result = tools.email_send(
             email_from,
@@ -213,12 +212,12 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             this.subject,
             body,
             openobject_id=str(case.id),
-            attach=[(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas],
+            attach=attach,
             reply_to=case.section_id.reply_to,
         )
 
         if result:
-            case_pool._history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, subject=this.subject, details=body, email_from=email_from)
+            case_pool.history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, subject=this.subject, details=body, email_from=email_from, attach=attach)
         else:
             raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 5560ec507bf..a77f553b173 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -82,7 +82,7 @@ class crm_lead2opportunity(osv.osv_memory):
                 'type': 'opportunity'
             }
             lead_obj.write(cr, uid, lead.id, vals, context=context)
-            lead_obj._history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
+            lead_obj.history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
             if lead.partner_id:
                 msg_ids = [ x.id for x in lead.message_ids]
                 self.pool.get('mailgate.message').write(cr, uid, msg_ids, {'partner_id': lead.partner_id.id}, context=context)
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index d790d9b7a0a..08395834115 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -23,7 +23,6 @@
 from osv import osv, fields
 from tools.translate import _
 import base64
-import time
 import tools
 from crm import crm
 
@@ -45,17 +44,17 @@ class crm_send_new_email_attachment(osv.osv_memory):
 
 crm_send_new_email_attachment()
 
-class crm_send_new_email(osv.osv_memory):
+class crm_send_new_email2(osv.osv_memory):
     """ Sends new email for the case"""
     _name = "crm.send.mail"
     _description = "Send new email"
 
     _columns = {
-        'email_to' : fields.char('To', size=64, required=True),
-        'email_from' : fields.char('From', size=64, required=True),
-        'email_cc' : fields.char('CC', size=128, help="Carbon Copy: list of recipients that will receive"\
+        'email_to' : fields.char('To', size=512, required=True),
+        'email_from' : fields.char('From', size=128, required=True),
+        'email_cc' : fields.char('CC', size=512, help="Carbon Copy: list of recipients that will receive"\
                                     " a copy of this mail, and future communication related to this case"),
-        'subject': fields.char('Subject', size=128, required=True),
+        'subject': fields.char('Subject', size=512, required=True),
         'text': fields.text('Message', required=True),
         'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
 
@@ -72,7 +71,6 @@ class crm_send_new_email(osv.osv_memory):
         """
 
         hist_obj = self.pool.get('mailgate.message')
-        smtp_pool = self.pool.get('email.smtpclient')
 
         if not context:
             context = {}
@@ -90,6 +88,7 @@ class crm_send_new_email(osv.osv_memory):
             ]
 
             message_id = None
+            ref_id = None
 
             case = case_pool.browse(cr, uid, res_id)
             if context.get('mail', 'new') == 'new':
@@ -101,6 +100,7 @@ class crm_send_new_email(osv.osv_memory):
                 model = hist.model
                 model_pool = self.pool.get(model)
                 res_id = hist.res_id
+                ref_id = hist.ref_id
                 case = model_pool.browse(cr, uid, res_id)
             emails = [obj.email_to]
             email_cc = (obj.email_cc or '').split(',')
@@ -128,10 +128,11 @@ class crm_send_new_email(osv.osv_memory):
             if not flag:
                 raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
             if flag:
-                case_pool._history(cr, uid, [case], _('Send'), history=True, \
+                case_pool.history(cr, uid, [case], _('Send'), history=True, \
                                 email=obj.email_to, details=body, \
                                 subject=obj.subject, email_from=email_from, \
-                                message_id=message_id, attach=attach)
+                                email_cc=email_cc, message_id=message_id, \
+                                references=ref_id or message_id, attach=attach)
                 if obj.state == 'unchanged':
                     pass
                 elif obj.state == 'done':
@@ -155,7 +156,7 @@ class crm_send_new_email(osv.osv_memory):
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
 
-        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
+        res = super(crm_send_new_email2, self).default_get(cr, uid, fields, context=context)
 
         if context.get('mail') == 'reply':
             res.update(self.get_reply_defaults(cr, uid, fields, context=context))
@@ -170,17 +171,17 @@ class crm_send_new_email(osv.osv_memory):
 
         for case in mod_obj.browse(cr, uid, res_id):
             if 'email_to' in fields:
-                res.update({'email_to': case.email_from})
+                res.update({'email_to': tools.ustr(case.email_from)})
             if 'email_from' in fields:
-                res.update({'email_from': user_mail_from})
+                res.update({'email_from': tools.ustr(user_mail_from)})
             if 'subject' in fields:
-                res.update({'subject': str(context.get('subject', case.name) or '')})
+                res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
             if 'email_cc' in fields:
-                res.update({'email_cc': case.email_cc or ''})
+                res.update({'email_cc': tools.ustr(case.email_cc or '')})
             if 'text' in fields:
-                res.update({'text': '\n\n'+(case.user_id.signature or '')})
+                res.update({'text': u'\n'+(tools.ustr(case.user_id.signature or ''))})
             if 'state' in fields:
-                res.update({'state': 'pending'})
+                res.update({'state': u'pending'})
 
         return res
 
@@ -207,28 +208,28 @@ class crm_send_new_email(osv.osv_memory):
             res_id = hist.res_id
             case = model_pool.browse(cr, uid, res_id)
             if 'email_to' in fields:
-                res.update({'email_to': case.email_from or hist.email_from or False})
+                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or False})
             if 'email_from' in fields:
-                res.update({'email_from': user_mail_from})
+                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or False})
 
-            signature = '\n' + (case.user_id.signature or '')
+            signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n'
             original = [signature]
 
             if include_original == True and 'text' in fields:
-                header = '-------- Original Message --------'
-                sender = 'From: %s' %(hist.email_from or '')
-                to = 'To: %s' % (hist.email_to or '')
-                sentdate = 'Date: %s' % (hist.date)
-                desc = '\n%s'%(hist.description)
+                header = u'-------- Original Message --------'
+                sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
+                to = u'To: %s' % (tools.ustr(hist.email_to or ''))
+                sentdate = u'Date: %s' % (tools.ustr(hist.date))
+                desc = u'\n%s'%(tools.ustr(hist.description))
 
-                original = [header, sender, to, sentdate, desc, signature]
+                original = [signature, header, sender, to, sentdate, desc]
 
-            res['text']= '\n\n\n' + '\n'.join(original)
+            res['text']= u'\n' + u'\n'.join(original)
 
             if 'subject' in fields:
-                res.update({'subject': 'Re: %s' %(hist.name or '')})
+                res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
             if 'state' in fields:
-                res['state']='pending'
+                res['state'] = u'pending'
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -246,13 +247,7 @@ class crm_send_new_email(osv.osv_memory):
 
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
-        model = context.get('model')
-        mod_obj = self.pool.get(model)
-        if context.get('mail') == 'reply':
-            return True
-        if tools.config.get('email_from'):
-            return True
         return True
 
-crm_send_new_email()
+crm_send_new_email2()
 
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index b5af4004801..3dfde724bdf 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -18,7 +18,7 @@
                     </group>
                     <notebook colspan="6">
                         <page string="Message">
-                            <field name="text" nolabel="1" colspan="4"/>
+                            <field name="text" nolabel="1" colspan="4" default_focus="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 48cc9055c58..75defcf3d88 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -2,266 +2,265 @@
 <openerp>
     <data>
 
-    <menuitem id="menu_config_claim" name="Claim"
-        groups="base.group_extended"
-        parent="base.menu_base_config" sequence="6" />
+        <menuitem id="menu_config_claim" name="Claim"
+            groups="base.group_extended"
+            parent="base.menu_base_config" sequence="6" />
 
-    <!-- Claims categories  -->
+        <!-- Claims categories  -->
 
-    <record id="crm_claim_categ_action" model="ir.actions.act_window">
-        <field name="name">Claim Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
+        <record id="crm_claim_categ_action" model="ir.actions.act_window">
+            <field name="name">Claim Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+            <field name="context">{'object_id':'crm.claim'}</field>
+        </record>
 
-    <menuitem action="crm_claim_categ_action" name="Categories"
-        id="menu_crm_case_claim-act" parent="menu_config_claim" />
+        <menuitem action="crm_claim_categ_action" name="Categories"
+            id="menu_crm_case_claim-act" parent="menu_config_claim" />
 
 
-    <!-- Claim Stages -->
+        <!-- Claim Stages -->
 
-    <record id="crm_claim_stage_act" model="ir.actions.act_window">
-        <field name="name">Claim Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
+        <record id="crm_claim_stage_act" model="ir.actions.act_window">
+            <field name="name">Claim Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+            <field name="context">{'object_id':'crm.claim'}</field>
+        </record>
 
-     <menuitem action="crm_claim_stage_act" name="Stages"
-            id="menu_crm_claim_stage_act" parent="menu_config_claim" />
+         <menuitem action="crm_claim_stage_act" name="Stages"
+                id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
-    <!-- Claim Resource Type -->
+        <!-- Claim Resource Type -->
 
-    <record id="crm_claim_resource_act" model="ir.actions.act_window">
-        <field name="name">Claim Resource Type</field>
-        <field name="res_model">crm.case.resource.type</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
+        <record id="crm_claim_resource_act" model="ir.actions.act_window">
+            <field name="name">Claim Resource Type</field>
+            <field name="res_model">crm.case.resource.type</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
+            <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+            <field name="context">{'object_id':'crm.claim'}</field>
+        </record>
 
-     <menuitem action="crm_claim_resource_act" name="Resource Type"
-            id="menu_crm_claim_stage_act"
-            parent="menu_config_claim" />
+         <menuitem action="crm_claim_resource_act" name="Resource Type"
+                id="menu_crm_claim_stage_act"
+                parent="menu_config_claim" />
 
         <!-- Claims    -->
 
-    <record model="ir.ui.view" id="crm_case_claims_tree_view">
-        <field name="name">CRM - Claims Tree</field>
-        <field name="model">crm.claim</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="user_id" />
-                <field name="section_id"/>
-                <field name="date" string="Claim Date"/>
-                <field name="date_deadline" string="Deadline"/>
-                <field name="date_closed" string="Closure Date"/>
-                <field name="categ_id" string="Type" select="1"/>
-                <field name="stage_id" invisible="1"/>
-                <field name="som" invisible="1"/>
-                <field name="state"/>
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_pending" string="Pending"
-                    states="draft,open" type="object"
-                    icon="gtk-media-pause" />
-                <button name="case_close" string="Close"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-close" />
-                <button name="case_cancel" string="Cancel"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-                <button name="case_reset" string="Reset to Draft"
-                    states="done,cancel" type="object" icon="gtk-convert" />
-            </tree>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="crm_case_claims_tree_view">
+            <field name="name">CRM - Claims Tree</field>
+            <field name="model">crm.claim</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" />
+                    <field name="section_id"/>
+                    <field name="date" string="Claim Date"/>
+                    <field name="date_deadline" string="Deadline"/>
+                    <field name="date_closed" string="Closure Date"/>
+                    <field name="categ_id" string="Type" select="1"/>
+                    <field name="stage_id" invisible="1"/>
+                    <field name="som" invisible="1"/>
+                    <field name="state"/>
+                    <button name="case_open" string="Open"
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" />
+                    <button name="case_pending" string="Pending"
+                        states="draft,open" type="object"
+                        icon="gtk-media-pause" />
+                    <button name="case_close" string="Close"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-close" />
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
+                    <button name="case_reset" string="Reset to Draft"
+                        states="done,cancel" type="object" icon="gtk-convert" />
+                </tree>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="crm_case_claims_form_view">
-        <field name="name">CRM - Claims Form</field>
-        <field name="model">crm.claim</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Claims">
+        <record model="ir.ui.view" id="crm_case_claims_form_view">
+            <field name="name">CRM - Claims Form</field>
+            <field name="model">crm.claim</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Claims">
 
-             <group colspan="4" col="4">
-                <group colspan="1" col="2">
-                    <field name="name" />
-                </group>
-                <group colspan="1" col="2">
-                     <field name="date" string="Date of Claim"/>
-                 </group>
-                <group colspan="1" col="2">
-                    <field name="date_deadline" string="Deadline"/><newline/>
-                </group>
-              </group>
-                <group colspan="4" col="4">
-
-                <notebook>
-                <page string="Claim Info">
-                    <separator colspan="4" string="Communication"/>
                     <group colspan="4" col="4">
-                        <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="partner_mobile"/>
-                        <field name="email_from"/>
-                    </group>
-                    <separator colspan="4" string="Status and Categorization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" string="Responsible"/>
-                        <field name="section_id" widget="selection"/>
-                        <label string="Stage: " align="1.0"/>
-                        <group colspan="1" col="3">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        <group colspan="1" col="2">
+                            <field name="name" />
+                        </group>
+                        <group colspan="1" col="2">
+                            <field name="date" string="Date of Claim"/>
+                        </group>
+                        <group colspan="1" col="2">
+                            <field name="date_deadline" string="Deadline"/><newline/>
                         </group>
-                        <field name="categ_id" select="1" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.claim')]" />
-                        <field name="type_id" string="Type of Action" select="1"
-                            domain="[('object_id.model', '=', 'crm.claim')]" />
-                        <field name="priority"/>
                     </group>
-                    <separator colspan="4" string="References"/>
                     <group colspan="4" col="4">
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                    <separator colspan="4" string="Claim/Action Description"/>
-                    <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string=""/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1"/>
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_close" string="Done"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-jump-to" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
-                        <button name="case_reset"
-                            string="Reset to Draft" states="done,cancel"
-                            type="object" icon="gtk-convert" />
-                    </group>
-                </page>
-                <page string="History" groups="base.group_extended">
-                    <field name="id" select="1"/>
-                    <field name="active"/>
-                    <field name="canal_id"/>
-                    <field name="som"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <tree string="Logs">
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </tree>
-                        <form string="Logs">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </form>
-                    </field>
-                </page>
-                <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                   <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
-                                <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
-                                        <field name="email_from"/>
+
+                        <notebook>
+                            <page string="Claim Info">
+                                <separator colspan="4" string="Communication"/>
+                                <group colspan="4" col="4">
+                                    <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="partner_mobile"/>
+                                    <field name="email_from"/>
+                                </group>
+                                <separator colspan="4" string="Status and Categorization"/>
+                                <group colspan="4" col="6">
+                                    <field name="user_id" string="Responsible"/>
+                                    <field name="section_id" widget="selection"/>
+                                    <label string="Stage: " align="1.0"/>
+                                    <group colspan="1" col="3">
+                                        <field name="stage_id" select="1" nolabel="1"/>
+                                        <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
+                                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                                     </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <field name="description" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                    <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'crm.lead'}"
-                                    icon="gtk-undo" type="action" />
-                                </form>
-                                <tree string="Communication history">
-                                    <field name="date"/>
-                                    <field name="email_from" />
-                                    <field name="email_to"/>
-                                    <field name="description"/>
-                                </tree>
-                         </field>
-                   <button colspan="4" string="Send New Email"
-                       name="%(crm.action_crm_send_mail)d"
-                       context="{'mail':'new', 'model': 'crm.claim'}"
-                       icon="gtk-go-forward" type="action" />
-                 </page>
-                </notebook>
+                                    <field name="categ_id" select="1" widget="selection"
+                                    domain="[('object_id.model', '=', 'crm.claim')]" />
+                                    <field name="type_id" string="Type of Action" select="1"
+                                    domain="[('object_id.model', '=', 'crm.claim')]" />
+                                    <field name="priority"/>
+                                </group>
+                                <separator colspan="4" string="References"/>
+                                <group colspan="4" col="4">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
+                                <separator colspan="4" string="Claim/Action Description"/>
+                                <field name="description" colspan="4" nolabel="1"/>
+                                <separator colspan="4" string=""/>
+                                <group col="8" colspan="4">
+                                    <field name="state" select="1"/>
+                                    <button name="case_open" string="Open"
+                                    states="draft,pending" type="object"
+                                    icon="gtk-go-forward" />
+                                    <button name="case_pending" string="Pending"
+                                    states="draft,open" type="object"
+                                    icon="gtk-media-pause" />
+                                    <button name="case_close" string="Done"
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-jump-to" />
+                                    <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
+                                    <button name="case_reset"
+                                    string="Reset to Draft" states="done,cancel"
+                                    type="object" icon="gtk-convert" />
+                                </group>
+                            </page>
+                            <page string="Emails" groups="base.group_extended">
+                                <group colspan="4">
+                                    <field colspan="4" name="email_cc" string="CC"/>
+                                </group>
+                                <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                                    <form string="Communication history">
+                                        <group col="6" colspan="4">
+                                            <field name="date"/>
+                                            <field name="email_to"/>
+                                            <field name="email_from"/>
+                                        </group>
+                                        <notebook colspan="4">
+                                            <page string="Details">
+                                                <field name="description" colspan="4" nolabel="1"/>
+                                            </page>
+                                            <page string="Attachments">
+                                                <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                            </page>
+                                        </notebook>
+                                        <button colspan="4"
+                                        string="Reply to Last Email"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.lead'}"
+                                        icon="terp-mail-replied" type="action" />
+                                    </form>
+                                    <tree string="Communication history">
+                                        <field name="date"/>
+                                        <field name="email_from" />
+                                        <field name="email_to"/>
+                                        <field name="description"/>
+                                    </tree>
+                                </field>
+                                <button colspan="4" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'crm.claim'}"
+                                icon="terp-mail-message-new" type="action" />
+                            </page>
+                            <page string="History" groups="base.group_extended">
+                                <field name="id" select="1"/>
+                                <field name="active"/>
+                                <field name="canal_id"/>
+                                <field name="som"/>
+                                <separator colspan="4" string="Dates"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                                <field name="log_ids" nolabel="1" colspan="4">
+                                    <tree string="Logs">
+                                        <field name="name" colspan="4"/>
+                                        <field name="date"/>
+                                        <field name="user_id"/>
+                                    </tree>
+                                    <form string="Logs">
+                                        <separator string="Action Information" colspan="4"/>
+                                        <field name="name" colspan="4"/>
+                                        <field name="date"/>
+                                        <field name="user_id"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-                </group>
-            </form>
-        </field>
-    </record>
+        <!-- Claim Calendar view -->
 
-    <!-- Claim Calendar view -->
+        <record model="ir.ui.view" id="crm_case_claims_calendar_view">
+            <field name="name">CRM - Claims Calendar</field>
+            <field name="model">crm.claim</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Claims" date_start="date" color="user_id">
+                    <field name="name"/>
+                    <field name="partner_name"/>
+                    <field name="categ_id"/>
+                </calendar>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="crm_case_claims_calendar_view">
-        <field name="name">CRM - Claims Calendar</field>
-        <field name="model">crm.claim</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Claims" date_start="date" color="user_id">
-                <field name="name"/>
-                <field name="partner_name"/>
-                <field name="categ_id"/>
-            </calendar>
-        </field>
-    </record>
+        <!-- Claim Graph view -->
 
-    <!-- Claim Graph view -->
+        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
+            <field name="name">CRM -Graph</field>
+            <field name="model">crm.claim</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
+                    <field name="stage_id"/>
+                    <field name="planned_cost" operator="+"/>
+                    <field name="planned_revenue" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-        <field name="name">CRM -Graph</field>
-        <field name="model">crm.claim</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                <field name="stage_id"/>
-                <field name="planned_cost" operator="+"/>
-                <field name="planned_revenue" operator="+"/>
-            </graph>
-        </field>
-    </record>
+        <!-- Crm claim Search view -->
 
-    <!-- Crm claim Search view -->
-
-    <record id="view_crm_case_claims_filter" model="ir.ui.view">
+        <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">crm.claim</field>
             <field name="type">search</field>
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index f903ab0c1d7..beb40a19dca 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_claim","crm.claim","model_crm_claim","crm.group_crm_manager",1,1,1,1
-"access_crm_claim_report_user","crm.claim.report","model_crm_claim_report","crm.group_crm_user",1,0,0,0
+"access_crm_claim_manager","crm.claim.manager","model_crm_claim","crm.group_crm_manager",1,1,1,1
+"access_crm_claim_user","crm.claim.user","model_crm_claim","crm.group_crm_user",1,1,1,1
+"access_crm_claim_report_user","crm.claim.report.user","model_crm_claim_report","crm.group_crm_user",1,0,0,0
+"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","crm.group_crm_manager",1,0,0,0
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68705d73d8e..b671b15f3dc 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -17,7 +17,7 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-       <menuitem action="crm_fund_categ_action" name="Categories"
+        <menuitem action="crm_fund_categ_action" name="Categories"
             id="menu_crm_case_fundraising-act" groups="base.group_extended"
             parent="menu_config_fundrising" />
 
@@ -154,41 +154,6 @@
                                     type="object" icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="History" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="active"/>
-                                <field name="id" select="1"/>
-                                <field name="priority" string="Priority"/>
-                                <field name="canal_id"/>
-                                <field name="som"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="duration"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
-                            </group>
-                            <field name="log_ids" nolabel="1" colspan="4">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
-                        </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="CC"/>
@@ -226,6 +191,41 @@
                                 context="{'mail':'new', 'model': 'crm.fundraising'}"
                                 icon="gtk-go-forward" type="action" />
                         </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Misc"/>
+                                <field name="active"/>
+                                <field name="id" select="1"/>
+                                <field name="priority" string="Priority"/>
+                                <field name="canal_id"/>
+                                <field name="som"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Dates"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                                <field name="duration"/>
+                            </group>
+                            <newline/>
+                            <group colspan="4" col="2">
+                                <separator colspan="4" string="References"/>
+                                <field colspan="4" name="ref"/>
+                                <field colspan="4" name="ref2"/>
+                            </group>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <tree string="Logs">
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </tree>
+                                <form string="Logs">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </form>
+                            </field>
+                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 43e607538ee..44880de6332 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_fundraising","crm.fundraising","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
-"access_crm_fundraising_report_user","crm.fundraising.report","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
+"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
+"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","crm.group_crm_user",1,1,1,1
+"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
+"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","crm.group_crm_manager",1,0,0,0
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index c077c219162..9fb6b673eb2 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -93,41 +93,6 @@
                                     icon="gtk-convert" />
                             </group>
                         </page>
-                        <page string="History" groups="base.group_extended">
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="id" select="1"/>
-                                <field name="active"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Estimates"/>
-                                <field name="planned_cost"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
-                            </group>
-                            <field colspan="4" name="log_ids" nolabel="1">
-                                <tree string="Logs">
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </tree>
-                                <form string="Logs">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date"/>
-                                    <field name="user_id"/>
-                                </form>
-                            </field>
-                        </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="CC"/>
@@ -165,6 +130,41 @@
                                 context="{'mail':'new', 'model': 'crm.helpdesk'}"
                                 icon="gtk-go-forward" type="action" />
                         </page>
+                        <page string="History" groups="base.group_extended">
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Dates"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Misc"/>
+                                <field name="id" select="1"/>
+                                <field name="active"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Estimates"/>
+                                <field name="planned_cost"/>
+                            </group>
+                            <newline/>
+                            <group colspan="4" col="2">
+                                <separator colspan="4" string="References"/>
+                                <field colspan="4" name="ref"/>
+                                <field colspan="4" name="ref2"/>
+                            </group>
+                            <field colspan="4" name="log_ids" nolabel="1">
+                                <tree string="Logs">
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </tree>
+                                <form string="Logs">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </form>
+                            </field>
+                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index c1420a5b2d6..c156428afbd 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_helpdesk","crm.helpdesk","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
-"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
+"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
+"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","crm.group_crm_user",1,1,1,1
+"access_report_crm_helpdesk_user","report.crm.helpdesk.user","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
+"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","crm.group_crm_manager",1,1,1,1
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 4b87e4c790e..f1fadd81bd4 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -149,7 +149,7 @@ class delivery_grid_line(osv.osv):
         'name': fields.char('Name', size=32, required=True),
         'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
         'type': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable', required=True),
-        'operator': fields.selection([('=','='),('<=','<='),('>=','>=')], 'Operator', required=True),
+        'operator': fields.selection([('==','='),('<=','<='),('>=','>=')], 'Operator', required=True),
         'max_value': fields.float('Maximum Value', required=True),
         'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
         'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True),
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index e459c423b59..948a85c35c7 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -7,5 +7,3 @@
 "access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
 "access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
-"access_delivery_sale_order_manager","delivery.sale.order","model_delivery_sale_order","sale.group_sale_manager",1,1,1,1
-"access_delivery_sale_order","delivery.sale.order","model_delivery_sale_order","sale.group_sale_user",1,0,0,0
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index e8b8b3969e9..a260a083d74 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -40,7 +40,7 @@
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process','board'],
+    'depends': ['process','board', 'knowledge'],
     'init_xml': [],
     'update_xml': [
         'security/document_security.xml',
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 4d89f96cbfb..0b85dc8039c 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -50,11 +50,13 @@
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
 
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
          <menuitem
-            name="Document"
+            name="Dashboard"
             id="menu_board_document"
-            parent="base.dashboard"
+            parent="menu_reporting"
+            sequence="0"
+            icon="terp-graph"
             groups="document.group_document_manager"/>
 
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5dc1bbcf0f8..1a5a4c8e1e3 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,11 +1,6 @@
 <openerp>
 <data>
-    <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
-    <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
-
-    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="group_document_user"/>
-    <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
-    <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
+    <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
 
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
@@ -163,7 +158,7 @@
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>                        
+                        <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>
                     </group>
                </search>
             </field>
@@ -304,7 +299,7 @@
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:type in ('url',)"> 
+            <tree colors="blue:type in ('url',)">
                 <field name="name"/>
                 <field name="type"/>
                 <field name="datas_fname"/>
@@ -323,7 +318,7 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
+    <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
         name="Documents"
         action="action_document_file_form"
@@ -397,7 +392,7 @@
         src_model="document.directory"/>
 
 
-    
+
 
 </data>
 </openerp>
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index 4c0492e8ff3..87ebd92c991 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index b2c45cd5bde..a81a0ac2272 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -151,8 +151,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -162,8 +161,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -217,8 +215,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -252,8 +249,7 @@ msgid "Notes"
 msgstr "Бележки"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -319,8 +315,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -347,8 +342,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -385,8 +379,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -470,3 +463,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Всички месеци"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Справки"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Този месец"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index cb60aeec24b..eb5489f1a3f 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr "Bilješke"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index edf2a702f99..46e309792f4 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -157,8 +157,7 @@ msgid "File Information"
 msgstr "Informació del fitxer"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Fitxers"
 
@@ -168,8 +167,7 @@ msgid "Stored Filename"
 msgstr "Nom del fitxer desat"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuari última modificació"
 
@@ -228,8 +226,7 @@ msgid "Directory Type"
 msgstr "Tipus de directori"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grups"
 
@@ -267,8 +264,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Contingut indexat"
 
@@ -338,8 +334,7 @@ msgid "Directory"
 msgstr "Directori"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Propietari"
 
@@ -366,8 +361,7 @@ msgid "Content Type"
 msgstr "Tipus de contingut"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Seguretat"
 
@@ -406,8 +400,7 @@ msgid "Domain"
 msgstr "Domini"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data de modificació"
 
@@ -491,3 +484,165 @@ msgstr "Fills"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Continguts"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Fitxers per mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Mur de la vergonya"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Fitxers detallats per empreses"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Tots els mesos"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Els meus fitxers"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Fitxers per usuaris"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Fitxers per mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Els meus fitxers (tots els mesos)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Últim nom de fitxer afegit"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuaris que no han insertat documents des de fa un mes"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Fitxers per empresa"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Aquest mes"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Fitxers de tots els usuaris"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Els meus fitxers (aquest mes)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Fitxers detallats per usuaris"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Núm. de fitxers"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Fitxers per usuaris"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Informes - Gestió documental"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Fitxers de tots els usuaris (tots els mesos)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Fitxers detallats per directori"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Data de modificació"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamany de fitxer per mes"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Nom del fitxer"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Fitxers per mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Fitxers per tipus de registre"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Tots els fitxers dels usuaris (aquest mes)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora de l'últim fitxer afegit"
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index 2652b3a70d2..0615ae2bf78 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -150,8 +150,7 @@ msgid "File Information"
 msgstr "Informace souboru"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Soubory"
 
@@ -161,8 +160,7 @@ msgid "Stored Filename"
 msgstr "Skladované jméno souboru"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Poslední upravující uživatel"
 
@@ -216,8 +214,7 @@ msgid "Directory Type"
 msgstr "Typ adresáře"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -251,8 +248,7 @@ msgid "Notes"
 msgstr "Poznámky"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -318,8 +314,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -346,8 +341,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -384,8 +378,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -469,3 +462,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index fba4a98db10..ca62a73a855 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -156,8 +156,7 @@ msgid "File Information"
 msgstr "Dateiinfo"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Dokument"
 
@@ -167,8 +166,7 @@ msgid "Stored Filename"
 msgstr "Abgespeicherter Dateiname"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Letzte Änderung"
 
@@ -226,8 +224,7 @@ msgid "Directory Type"
 msgstr "Verzeichnistyp"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -265,8 +262,7 @@ msgid "Notes"
 msgstr "Notizen"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Inhaltsindizierung"
 
@@ -336,8 +332,7 @@ msgid "Directory"
 msgstr "Verzeichnis"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -364,8 +359,7 @@ msgid "Content Type"
 msgstr "Berichtsinhalt"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Sicherheit"
 
@@ -404,8 +398,7 @@ msgid "Domain"
 msgstr "Domain"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Änderungsdatum"
 
@@ -489,3 +482,165 @@ msgstr "Kindelemente"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Inhalte"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Dokumente pro Monat"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Statistik"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Dokumenteninhalte nach Partnern"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Alle Monate"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Meine Dokumente"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Dokumente nach Benutzern"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Dokumente pro Monat"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Meine Dokumente (Alle Monate)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Letztes Dokument"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Berichtswesen"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Benutzer die keine Dokumente erzeugt haben in diesem Monat"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Dokumente nach Partnern"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Dieser Monat"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Alle Benutzer Dokumente"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Meine Dokumente (Aktueller Monat)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Dokumenteninhalt nach Benutzer"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# Dokumente"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Dokumente nach Benutzern"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Dokumenten Verwaltung - Berichte"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Alle Benutzer Dokumente (Alle Monate)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Dokumenteninhalte nach Verzeichnis"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Änderungsdatum"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Dateigroesse nach Monat"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Dokumentenbezeichnung"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Dokumente nach Monaten"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Dokumente nach Typen"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Alle Benutzer Dokumente (Aktueller Monat)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Letzte Aktualisierung"
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index c51e8eccfdd..8bbad608c8f 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -452,3 +452,166 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
+
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 1c062b61792..d71666b2c75 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-23 17:25+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -158,8 +158,7 @@ msgid "File Information"
 msgstr "Información del archivo"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Archivos"
 
@@ -169,8 +168,7 @@ msgid "Stored Filename"
 msgstr "Nombre del archivo guardado"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario última modificación"
 
@@ -229,8 +227,7 @@ msgid "Directory Type"
 msgstr "Tipo de directorio"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -268,8 +265,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Contenido indexado"
 
@@ -339,8 +335,7 @@ msgid "Directory"
 msgstr "Directorio"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -367,8 +362,7 @@ msgid "Content Type"
 msgstr "Tipo de contenido"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Seguridad"
 
@@ -407,8 +401,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha modificación"
 
@@ -492,3 +485,165 @@ msgstr "Hijos"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Contenidos"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Muro de la vergüenza"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Archivos detallados por empresas"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Todos los meses"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Mis archivos"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Mis archivos (todos los meses)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Último nombre de archivo añadido"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuarios que no han insertado documentos desde hace un mes"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Mis archivos (este mes)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Archivos detallados por usuarios"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Núm. de archivos"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Informes - Gestión documental"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Archivos de todos los usuarios (todos los meses)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Archivos detallados por directorio"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Fecha modificación"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamaño de archivo por mes"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Archivos por tipo de registro"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Todos los archivos de los usuarios (este mes)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora del último archivo añadido"
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index a18cefeed04..1fd854ac88e 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -156,8 +156,7 @@ msgid "File Information"
 msgstr "Información del archivo"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Archivos"
 
@@ -167,8 +166,7 @@ msgid "Stored Filename"
 msgstr "Nombre del archivo guardado"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Usuario de la última modificación"
 
@@ -227,8 +225,7 @@ msgid "Directory Type"
 msgstr "Tipo de directorio"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -266,8 +263,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Contenido indexado"
 
@@ -337,8 +333,7 @@ msgid "Directory"
 msgstr "Directorio"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Propietario"
 
@@ -365,8 +360,7 @@ msgid "Content Type"
 msgstr "Tipo de contenido"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Seguridad"
 
@@ -405,8 +399,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Fecha de modificación"
 
@@ -490,3 +483,165 @@ msgstr "Hijos"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Índice"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Muro de la vergüenza"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Detalles de los archivos por partners"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Todos los meses"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Mis archivos"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Mis archivos (todos los meses)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Último nombre de archivo publicado"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Informes"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Usuarios que no han insertado documentos desde hace un mes"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Archivos por empresa"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Archivos de todos los usuarios"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Mis archivos (este mes)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Archivos detallados por usuarios"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# de archivos"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Archivos por usuarios"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Gestión de documentos - Informes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Archivos de todos los usuarios (todos los meses)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Detalles de archivos por directorio"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Fecha de modificación"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Tamaño de archivo por mes"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Nombre"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Archivos por mes"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Archivos por tipo de recurso"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Todos los archivos de los usuarios (este mes)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Hora del último archivo publicado"
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 9af47bc39fc..b979e07b82f 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -154,8 +154,7 @@ msgid "File Information"
 msgstr "Faili informatsioon"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Failid"
 
@@ -165,8 +164,7 @@ msgid "Stored Filename"
 msgstr "Salvestatud failinimi"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Viimati muutnud kasutaja"
 
@@ -222,8 +220,7 @@ msgid "Directory Type"
 msgstr "Kausta tüüp"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupid"
 
@@ -260,8 +257,7 @@ msgid "Notes"
 msgstr "Märkmed"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Indekseeritud sisu"
 
@@ -331,8 +327,7 @@ msgid "Directory"
 msgstr "Kataloog"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Omanik"
 
@@ -359,8 +354,7 @@ msgid "Content Type"
 msgstr "Sisu tüüp"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Turvalisus"
 
@@ -399,8 +393,7 @@ msgid "Domain"
 msgstr "Domeen"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Muutmise kuupäev"
 
@@ -484,3 +477,165 @@ msgstr "Alam"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Sisukord"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Faile Kuukohta"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Häbipost"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Failidetailid Partneritejärgi"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Kõik kuud"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Minu failid"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Failid kasutajatejärgi"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Faile kuus"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Minu failid (kõik kuud)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Viimati üleslaetud Failinimi"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Aruandlus"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Kasutajad kes pole huvitatud dokumentidest kuujooksul"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Failid Partnerijärgi"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Käesolev kuu"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Kõik Kasutajate Failid"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Minufailid (nendel kuudel)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Failid Detailselt Kasutajajärgi"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Failide arv"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Failid Kasutajajärgi"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Dokumendihaldus - Aruanne"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Kõik kasutajate failid (kõik kuud)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Failid detailselt Ktaloogijärgi"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Muutmise kuupäev"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Failisuurused kuu kaupa"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Failinimi"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Failid kuu kaupa"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Failid ressursitüübi järgi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Kõik Kasutajate failid (Käesoleval kuul)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Viimane üleslaadimise aeg"
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index cdc60d8d1c5..d1336193d8f 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -153,8 +153,7 @@ msgid "File Information"
 msgstr "Informations sur le fichier"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Fichiers"
 
@@ -164,8 +163,7 @@ msgid "Stored Filename"
 msgstr "Nom du Fichier Enregistré"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Utilisateur de la Dernière Modification"
 
@@ -222,8 +220,7 @@ msgid "Directory Type"
 msgstr "Type de Répertoire"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Groupes"
 
@@ -261,8 +258,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Contenu Indexé"
 
@@ -328,8 +324,7 @@ msgid "Directory"
 msgstr "Répertoire"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -356,8 +351,7 @@ msgid "Content Type"
 msgstr "Type de Contenu"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Sécurité"
 
@@ -397,8 +391,7 @@ msgid "Domain"
 msgstr "Domaine"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Date de Modification"
 
@@ -482,3 +475,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Contenus"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Fichiers par Mois"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Mur de la Honte"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Détails des Fichiers par Partenaire"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Tous les mois"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Mes Fichiers"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Fichiers par Utilisateur"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Mes Fichiers (Tous les Mois)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Nom du Dernier Fichier Posté"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Reporting"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Utilisateurs qui n'ont pas insérés de documents depuis un mois"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Ce mois"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Fichiers de tous les Utilisateurs"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Mes Fichiers (Ce mois)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Détail des Fichiers par Utilisateurs"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# de Fichiers"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Fichiers par Utilisateurs"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Tous les Fichiers des Utilisateurs (Tous les Mois)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Détails des Fichiers par Répertoire"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Date de Modification"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Taille des Fichiers par Mois"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Nom du Fichier"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Fichiers par Mois"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Fichiers par Type de Ressource"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Temps de la Dernière Insertion"
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 9ed8831cc43..5c8ecbe9d87 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -156,8 +156,7 @@ msgid "File Information"
 msgstr "Podaci o datoteci"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Datoteke"
 
@@ -167,8 +166,7 @@ msgid "Stored Filename"
 msgstr "Pohranjeni naziv datoteke"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Korisnik posljednje promjene"
 
@@ -226,8 +224,7 @@ msgid "Directory Type"
 msgstr "Vrsta mape"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupe"
 
@@ -265,8 +262,7 @@ msgid "Notes"
 msgstr "Bilješke"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Indeksirani sadržaj"
 
@@ -336,8 +332,7 @@ msgid "Directory"
 msgstr "Mapa"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Vlasnik"
 
@@ -364,8 +359,7 @@ msgid "Content Type"
 msgstr "Vrsta datoteke"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Sigurnost"
 
@@ -404,8 +398,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum izmjene"
 
@@ -489,3 +482,165 @@ msgstr "Slijedne stavke"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Sadržaji"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Spisi po Mjesecu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Zid Srama"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Detalji Spisa po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Svi mjeseci"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Moji Spisi"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Spisi po Korisniku"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Spisi po Mjesecu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Moji Spisi (Svi mjeseci)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Zadnje postavljeno Ime Spisa"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Izvještavanje"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Korisnici koji jedan mjesec nisu unijeli Dokument"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Spisi po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Ovaj mjesec"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Svi Spisi Korisnika"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Moji Spisi (Ovaj mjesec)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Detalji Spisa prema Korisnicima"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# Spisa"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Spisi prema Korisnicima"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Upravljanje Dokumentima - Izvještavanje"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Spisi svih Korisnika (Svi mjeseci)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Detalji Spisa prema Direktoriju"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Izmjenjen Datum"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Veličina spisa po Mjesecu"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Ime Spisa"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Spisi po Mjesecu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Spisi po tipu Izvora"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Spisi svih Korisnika (Ovaj mjesec)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Zadnje postavljeno Vrijeme"
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index e3663ebc344..972a7d9a84f 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr "Jegyzetek"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index 361a4a3e560..dae402499ab 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Semua Bulan"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Pelaporan"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Bulan Ini"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index cf3c5ef2fe0..3f82b6640e3 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -106,7 +106,7 @@ msgstr "Allegato"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: document
 #: selection:document.directory,type:0
@@ -153,8 +153,7 @@ msgid "File Information"
 msgstr "Informazione del file"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "File"
 
@@ -164,8 +163,7 @@ msgid "Stored Filename"
 msgstr "Nome file Memorizzati"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -219,8 +217,7 @@ msgid "Directory Type"
 msgstr "Tipo Cartella"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -257,8 +254,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Contenuto Indicizzato"
 
@@ -324,8 +320,7 @@ msgid "Directory"
 msgstr "Cartella"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Proprietario"
 
@@ -352,8 +347,7 @@ msgid "Content Type"
 msgstr "Tipo Di Contenuto"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Sicurezza"
 
@@ -390,8 +384,7 @@ msgid "Domain"
 msgstr "Dominio"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data modifica"
 
@@ -475,3 +468,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Contenuti"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "File per mesi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Muro della vergogna"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Dettagli file per Partner"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Tutti i Mesi"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "I Miei File"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "File per utenti"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "File per mesi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "I Miei file (Tutti i mesi)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Ultimo file inviato"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Reportistica"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Utenti che non inviano documenti da un mese"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Questo Mese"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 7ee56c45a26..64197aaa0a9 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/i18n/ko.po
@@ -126,7 +126,9 @@ msgstr "가시적인 리소스에 자동 필터를 적용하려면, 도메인을
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr "시스템이 선택한 오브젝트와 동일한 트리 구조를 이용하려면, 여기를 체크하십시오."
+msgstr ""
+"시스템이 선택한 오브젝트와 동일한 트리 구조를 이용하려면, 여기를 체크하십시"
+"오."
 
 #. module: document
 #: field:document.directory,type:0
@@ -150,8 +152,7 @@ msgid "File Information"
 msgstr "파일 정보"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "파일"
 
@@ -161,8 +162,7 @@ msgid "Stored Filename"
 msgstr "보관된 파일 이름"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "최종 수정 사용자"
 
@@ -199,8 +199,8 @@ msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
 msgstr ""
-"여기에 오브젝트를 두면, 이 디렉토리 템플릿이 모든 오브젝트 아래에 표시됩니다. 페어런트 모델을 선택했다면, 페어런트 디렉토리를 두면 "
-"안됩니다."
+"여기에 오브젝트를 두면, 이 디렉토리 템플릿이 모든 오브젝트 아래에 표시됩니"
+"다. 페어런트 모델을 선택했다면, 페어런트 디렉토리를 두면 안됩니다."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -218,8 +218,7 @@ msgid "Directory Type"
 msgstr "디렉토리 타입"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "그룹"
 
@@ -233,14 +232,17 @@ msgstr "리포트"
 msgid ""
 "Put here the server address or IP. Keep localhost if you don't know what to "
 "write."
-msgstr "서버 주소 또는 IP를 기록하십시오. 잘 모르겠으면 localhost로 설정하십시오."
+msgstr ""
+"서버 주소 또는 IP를 기록하십시오. 잘 모르겠으면 localhost로 설정하십시오."
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid ""
 "This wizard will automatically configure the document management system "
 "according to modules installed on your system."
-msgstr "이 위저드는 귀하의 시스템에 설치된 모듈들에 따라 문서 관리 시스템을 구성합니다."
+msgstr ""
+"이 위저드는 귀하의 시스템에 설치된 모듈들에 따라 문서 관리 시스템을 구성합니"
+"다."
 
 #. module: document
 #: view:ir.attachment:0
@@ -253,8 +255,7 @@ msgid "Notes"
 msgstr "노트"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "인덱스된 컨텐트"
 
@@ -324,8 +325,7 @@ msgid "Directory"
 msgstr "디렉토리"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "소유자"
 
@@ -352,8 +352,7 @@ msgid "Content Type"
 msgstr "컨텐트 타입"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "보안"
 
@@ -378,8 +377,8 @@ msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
 msgstr ""
-"여기서 오브젝트를 선택하면, 주어진 도메인을 사용하여, FTP를 통해 브라우징할 때, 시스템이 이들 오브젝트 각각에 대해, 매핑을 "
-"생성합니다."
+"여기서 오브젝트를 선택하면, 주어진 도메인을 사용하여, FTP를 통해 브라우징할 "
+"때, 시스템이 이들 오브젝트 각각에 대해, 매핑을 생성합니다."
 
 #. module: document
 #: view:ir.attachment:0
@@ -392,8 +391,7 @@ msgid "Domain"
 msgstr "도메인"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "날짜가 수정됨"
 
@@ -478,10 +476,170 @@ msgstr "칠드런"
 msgid "Contents"
 msgstr "컨텐트"
 
-#, python-format
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
+
 #~ msgid "Directory name contains special characters!"
 #~ msgstr "디렉토리 이름이 특수 문자를 포함하고 있습니다 !"
 
-#, python-format
 #~ msgid "Directory name must be unique!"
 #~ msgstr "디렉토리 이름은 고유해야 합니다!"
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index 5f910f2df93..d5e0991751e 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 88b3fb7c644..78d91a24a41 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -155,8 +155,7 @@ msgid "File Information"
 msgstr "Bestandsinformatie"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Bestanden"
 
@@ -166,8 +165,7 @@ msgid "Stored Filename"
 msgstr "Opgeslagen bestandsnaam"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Laatste wijziging door gebruiker"
 
@@ -226,8 +224,7 @@ msgid "Directory Type"
 msgstr "Soort map"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Groepen"
 
@@ -265,8 +262,7 @@ msgid "Notes"
 msgstr "Notities"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Geïndexeerde inhoud"
 
@@ -336,8 +332,7 @@ msgid "Directory"
 msgstr "Map"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -364,8 +359,7 @@ msgid "Content Type"
 msgstr "Soort inhoud"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Beveiliging"
 
@@ -404,8 +398,7 @@ msgid "Domain"
 msgstr "Domein"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Wijzigingsdatum"
 
@@ -489,3 +482,165 @@ msgstr "Dochters"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Inhoud"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Bestanden per maand"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Wall of Shame"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Alle maanden"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Mijn bestanden"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Bestanden per gebruiker"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Bestanden per maand"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Mijn bestanden (alle maanden)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Laatst geposte bestandnaam"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Overzichten"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Gebruikers die de laatste maand geen documenten hebben toegevoegd"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Bestanden per relatie"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Deze maand"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Alls gebruikersbestanden"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Mijn bestanden (deze maanden)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Bestandsdetails per gebruiker"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# bestanden"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Bestanden per gebruikers"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Documentbeheer - Overzichten"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Alle gebruikersbestanden (alle maanden)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Bestandsdetails per map"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Wijzigingsdatum"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Bestandsgrootte per maand"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Bestandsnaam"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Bestanden per maand"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Bestanden per soort bron"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Alle gebruikersbestanden (deze maand)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Laatste plaatsing"
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index 6bcc339cf21..52c1e710173 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -150,8 +150,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -161,8 +160,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -216,8 +214,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -251,8 +248,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -318,8 +314,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -346,8 +341,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -384,8 +378,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -469,3 +462,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 18e50e6e2b3..49dd4b10d1c 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -151,8 +151,7 @@ msgid "File Information"
 msgstr "Informacje o pliku"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Pliki"
 
@@ -162,8 +161,7 @@ msgid "Stored Filename"
 msgstr "Nazwa zapisanego pliku"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Autor ostatniej modyfikacji"
 
@@ -217,8 +215,7 @@ msgid "Directory Type"
 msgstr "Typ katalogu"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupy"
 
@@ -256,8 +253,7 @@ msgid "Notes"
 msgstr "Uwagi"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Indeksowana zawartość"
 
@@ -327,8 +323,7 @@ msgid "Directory"
 msgstr "Katalog"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -355,8 +350,7 @@ msgid "Content Type"
 msgstr "Typ zawartości"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Uprawnienia"
 
@@ -393,8 +387,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data modyfikacji"
 
@@ -478,3 +471,165 @@ msgstr "Podrzędne"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Zawartości"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Raportowanie"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index 1eb2584c7d4..88dffc969dc 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -155,8 +155,7 @@ msgid "File Information"
 msgstr "Informação do Ficheiro"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Ficheiros"
 
@@ -166,8 +165,7 @@ msgid "Stored Filename"
 msgstr "Nome do ficheiro guardado"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Utilizador da última modificação"
 
@@ -225,8 +223,7 @@ msgid "Directory Type"
 msgstr "Tipo de pasta"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Grupos"
 
@@ -264,8 +261,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Conteúdo indexado"
 
@@ -335,8 +331,7 @@ msgid "Directory"
 msgstr "Pasta"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Dono"
 
@@ -363,8 +358,7 @@ msgid "Content Type"
 msgstr "Tipo de conteúdo"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Segurança"
 
@@ -403,8 +397,7 @@ msgid "Domain"
 msgstr "Domínio"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Data da modificação"
 
@@ -488,3 +481,165 @@ msgstr "Dependentes"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Conteúdo"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Todos os meses"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Relatório"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Este mês"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 9e8032d9cc7..3e5af65f22d 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -155,8 +155,7 @@ msgid "File Information"
 msgstr "Informação do Arquivo"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Arquivos"
 
@@ -166,8 +165,7 @@ msgid "Stored Filename"
 msgstr "Nome de arquivos armazenados"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Última modificações do usuário"
 
@@ -221,8 +219,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -256,8 +253,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -323,8 +319,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -351,8 +346,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -389,8 +383,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -474,3 +467,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Todos os meses"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Relatórios"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index a4f23e5e983..3a970a830af 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -17,9 +17,10 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
-#: field:document.directory,create_date:0
+#: field:report.document.user,create_date:0
+#: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data creării"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -36,6 +37,8 @@ msgstr ""
 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 !"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -68,9 +71,11 @@ msgid "Auto Configure Directory"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Mărime fişier"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -102,7 +107,7 @@ msgstr ""
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acțiunii"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -149,10 +154,9 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Fişiere"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -160,8 +164,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -200,9 +203,9 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document
 msgid "Document Management"
-msgstr ""
+msgstr "Managementul documentelor"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -210,13 +213,12 @@ msgid "Link"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
+#: field:report.document.user,type:0 field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tip de director"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +252,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -263,7 +264,7 @@ msgstr ""
 #. module: document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -311,16 +312,15 @@ msgid "Integrated Document Management System"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,directory_id:0
-#: field:ir.attachment,parent_id:0
+#: field:report.document.user,directory:0
+#: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Director"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0 field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Deținător"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
@@ -345,8 +345,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +382,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -445,9 +443,9 @@ msgid "Cancel"
 msgstr ""
 
 #. module: document
-#: field:ir.attachment,partner_id:0
+#: field:report.document.user,partner:0 field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: document
 #: view:document.directory:0
@@ -468,3 +466,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Fişiere pe lună"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Panoul ruşinii"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Detalii fişier după parteneri"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Toate lunile"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Fişierele mele"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Fişiere după utilizatori"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Fişiere pe lună"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Fişierele mele (toale lunile)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Numele ultimului fişier postat"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Raportare"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Utilizatori care nu au inserat documente în ultima lună"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Fişiere după parteneri"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Luna curentă"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Utilizator"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Fişierele tuturor utilizatorilor"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Fişierele mele (luna curentă)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Detalii fişiere după utilizator"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Număr de fişiere"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Fişiere după utilizatori"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Management documente - Raportări"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Toate fişierele utilizatorilor (toate lunile)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Detalii fişiere după directoare"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Data modificării"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Mărime fişiere pe luni"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Nume fișier"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Luna"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Fişiere pe luni"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Fişiere pe tipuri de resursă"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Fişierele tuturor utilizatorilor (luna curentă)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Ora ultimei postări"
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 59a51cb9666..654e3a4944b 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -36,6 +36,8 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -149,8 +151,7 @@ msgid "File Information"
 msgstr "Информация о файле"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Файлы"
 
@@ -160,8 +161,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Последние изменения пользователя"
 
@@ -215,8 +215,7 @@ msgid "Directory Type"
 msgstr "Тип папки"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Группы"
 
@@ -251,8 +250,7 @@ msgid "Notes"
 msgstr "Примечания"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -312,16 +310,15 @@ msgid "Integrated Document Management System"
 msgstr ""
 
 #. module: document
-#: field:document.directory.content,directory_id:0
-#: field:ir.attachment,parent_id:0
+#: field:report.document.user,directory:0
+#: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Папка"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0 field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Владелец"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
@@ -346,8 +343,7 @@ msgid "Content Type"
 msgstr "Тип данных"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Безопасность"
 
@@ -384,8 +380,7 @@ msgid "Domain"
 msgstr "Домен"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Дата изменения"
 
@@ -446,9 +441,9 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #. module: document
-#: field:ir.attachment,partner_id:0
+#: field:report.document.user,partner:0 field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
 
 #. module: document
 #: view:document.directory:0
@@ -469,3 +464,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Содержание"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Файлов в месяц"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Доска позора"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Все месяцы"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Мои файлы"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Файлов в месяц"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Мои файлы (Все месяцы)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Отчетность"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Пользователи, не вставляшие документов месяц"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Данный месяц"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Файлы всех пользователей"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Мои файлы (Текущий месяц)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Изменённая дата"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Имя файла"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Файлы по месяцам"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Файлы по типам ресурсов"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Файлы всех пользователей (Текущий месяц)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index a16d4afb4f4..8f2a71a4ee7 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -150,8 +150,7 @@ msgid "File Information"
 msgstr "Podatki o datoteki"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "Datoteke"
 
@@ -161,8 +160,7 @@ msgid "Stored Filename"
 msgstr "Ime shranjene datoteke"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Uporabnik, ki je zadnji spreminjal"
 
@@ -216,8 +214,7 @@ msgid "Directory Type"
 msgstr "Vrsta imenika"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Skupine"
 
@@ -253,8 +250,7 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "Indeksirana vsebina"
 
@@ -324,8 +320,7 @@ msgid "Directory"
 msgstr "Imenik"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Lastnik"
 
@@ -352,8 +347,7 @@ msgid "Content Type"
 msgstr "Tip vsebine"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Varnost"
 
@@ -390,8 +384,7 @@ msgid "Domain"
 msgstr "Domena"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Datum spremembe"
 
@@ -475,3 +468,165 @@ msgstr "Otroci"
 #: view:document.directory:0
 msgid "Contents"
 msgstr "Vsebina"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Datotek na mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Zid sramu"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Podrobnosti datotek po partnerjih"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Vsi meseci"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Moje datoteke"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Datoteke po uporabnikih"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Datotek na mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Moje datoteke (vsi meseci)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Ime zadnje objavljene datoteke"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Poročanje"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Uporabniki, ki v zadnjem mesecu niso vložili dokumentov"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Datoteke po partnerju"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Vse uporabniške datoteke"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Moje datoteke (ta mesec)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Podrobnosti datotek po uporabnikih"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# datotek"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Datoteke po uporabnikih"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Upravljanje dokumentov - poročila"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Vse uporabniške datoteke (vsi meseci)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Podrobnosti datotek po imenikih"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Datum spremembe"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Velikost datoteke po mesecu"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Ime datoteke"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Datoteke po mesecih"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Datoteke po tipih virov"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Vse datoteke uporabnika (ta mesec)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Čas zadnje objave"
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index c96028a51e2..3996469f90c 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -150,8 +150,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -161,8 +160,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -216,8 +214,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -251,8 +248,7 @@ msgid "Notes"
 msgstr "Anteckningar"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -318,8 +314,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -346,8 +341,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -384,8 +378,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -469,3 +462,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index c09d430ff4a..97ffad5ef4a 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index a6bccf0287c..b9ac71212bf 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr "Dosya Bilgisi"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "Son Düzenleyen Kullanıcı"
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr "Klasör Tipi"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "İndexlenen İçerik"
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr "Klasör"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "Sahibi"
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "Güvenlik"
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "Düzenlenen Tarih"
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Cari Detaylı Dosyaları"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Tüm Aylar"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Dosyalarım"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Aylık Dosyalar"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Yıl Raporu (Tüm Aylar)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Son Gönderilen Dosya Adı"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Raporlama"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Cariye Bazında Dosyalar"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Bu Ay"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Kullanıcı"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Tüm Kullancı Dosyaları"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Dosyalarım (Bu Aykiler)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "Dosya Sayısı"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Döküman Yönetimi - Raporlama"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Tüm Kullanıcı Dosyaları (Tüm Aylar)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Değiştirme Tarihi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Ay Bazında Dosya Boyutu"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Dosya Adı"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Ay Bazında Dosyalar"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Kaynak Tipine göre Dosyalar"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Tüm Kullancı Dosyaları ( Bu Ay )"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Son Gönderilen Zaman"
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index ffcd1a7d634..9bb0bfcace4 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -150,8 +150,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -161,8 +160,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -216,8 +214,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -251,8 +248,7 @@ msgid "Notes"
 msgstr "Примітки"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -318,8 +314,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -346,8 +341,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -384,8 +378,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -469,3 +462,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Всі місяці"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Звіти"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Цей місяць"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index f8c19edf98b..e587c495654 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr "文件信息"
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr "文件"
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr "保存文件名"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr "最近修改用户"
 
@@ -197,7 +195,9 @@ msgstr "目录内容"
 msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
-msgstr "如果你在这填上对象,这目录的模板将涵盖所有的对象.如果您选择母公司模式不要填入父目录"
+msgstr ""
+"如果你在这填上对象,这目录的模板将涵盖所有的对象.如果您选择母公司模式不要填入"
+"父目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -215,8 +215,7 @@ msgid "Directory Type"
 msgstr "目录类型"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr "组"
 
@@ -250,8 +249,7 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr "内容索引"
 
@@ -321,8 +319,7 @@ msgid "Directory"
 msgstr "说明"
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr "拥有者"
 
@@ -349,8 +346,7 @@ msgid "Content Type"
 msgstr "内容类型"
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr "安全"
 
@@ -390,8 +386,7 @@ msgid "Domain"
 msgstr "隶属"
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr "修改日期"
 
@@ -476,5 +471,183 @@ msgstr "子目录"
 msgid "Contents"
 msgstr "内容"
 
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "月度文件"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "羞愧者名单"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "业务伙伴文件详细信息"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "所有月份"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "我的文件"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "用户文件"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "每月的文件"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "我的文件(所有月份)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "最近发布的文件名"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "内部报表"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "一个月以来用户没有新文件"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "业务伙伴文件"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "本月"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "用户"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "所有用户文件"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "我的文件(这月)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "用户详细信息"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "文件号"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "用户文件"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "文档管理 - 报表"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "所有文件(所有月份)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "文件详细目录"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "修改日期"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "这月的文件大小"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "文件名"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "月"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "这月的文件"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "文件的资源类型"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "所有文件(所有月份)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "最近的发布时间"
+
 #~ msgid "Active"
 #~ msgstr "生效"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the Document Management module:\n"
+#~ "    * My Files\n"
+#~ "    * All users Files \n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    报告文档管理模块:\n"
+#~ "\t\t- 我的文件\n"
+#~ "\t\t- 所有用户的文件 \n"
+#~ "    "
+
+#~ msgid "Files Per Partner"
+#~ msgstr "每个业务伙伴文件"
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 474ab85abbb..a0dc9a0b1a3 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
+# 	* document
 #
 msgid ""
 msgstr ""
@@ -149,8 +149,7 @@ msgid "File Information"
 msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
+#: field:document.directory,file_ids:0 view:ir.attachment:0
 msgid "Files"
 msgstr ""
 
@@ -160,8 +159,7 @@ msgid "Stored Filename"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
+#: field:document.directory,write_uid:0 field:ir.attachment,write_uid:0
 msgid "Last Modification User"
 msgstr ""
 
@@ -215,8 +213,7 @@ msgid "Directory Type"
 msgstr ""
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
+#: field:document.directory,group_ids:0 field:ir.attachment,group_ids:0
 msgid "Groups"
 msgstr ""
 
@@ -250,8 +247,7 @@ msgid "Notes"
 msgstr "注解"
 
 #. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
+#: view:ir.attachment:0 field:ir.attachment,index_content:0
 msgid "Indexed Content"
 msgstr ""
 
@@ -317,8 +313,7 @@ msgid "Directory"
 msgstr ""
 
 #. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
+#: field:document.directory,user_id:0 field:ir.attachment,user_id:0
 msgid "Owner"
 msgstr ""
 
@@ -345,8 +340,7 @@ msgid "Content Type"
 msgstr ""
 
 #. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
+#: view:document.directory:0 view:ir.attachment:0
 msgid "Security"
 msgstr ""
 
@@ -383,8 +377,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
+#: field:document.directory,write_date:0 field:ir.attachment,write_date:0
 msgid "Date Modified"
 msgstr ""
 
@@ -468,3 +461,165 @@ msgstr ""
 #: view:document.directory:0
 msgid "Contents"
 msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr ""
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr ""
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 333cc853542..d7b51ec19dc 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -10,7 +10,7 @@
         <field name="name">Document / Manager</field>
     </record>
 
-    <record id="base.menu_document_configuration" model="ir.ui.menu">
+    <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
         <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
     </record>
 
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index a4412195745..245bcbffeab 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -19,5 +19,3 @@
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
-"access_document_configuation","document.configuration document manager","model_document_configuration","document.group_document_manager",1,1,1,1
-"access_document_configuation_system","document.configuration group system","model_document_configuration","base.group_system",1,1,1,1
diff --git a/addons/document_email/document_email.xml b/addons/document_email/document_email.xml
index bfcde49816a..5509d6e8cfb 100644
--- a/addons/document_email/document_email.xml
+++ b/addons/document_email/document_email.xml
@@ -92,12 +92,6 @@
             <field name="context">{}</field>
             <field name="domain">[]</field>
         </record>
-        
-<!--        <menuitem -->
-<!--            parent="base.menu_document"-->
-<!--            id="menu_action_document_email_tree" -->
-<!--            name="Email to Documents"-->
-<!--            action="action_document_email_form"/>-->
-        
+
     </data>
 </openerp>
diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv
index b3ffdbd5350..0a6c192eb56 100644
--- a/addons/document_ftp/security/ir.model.access.csv
+++ b/addons/document_ftp/security/ir.model.access.csv
@@ -1,6 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_ftp_browse","document.ftp.browse document manager","model_document_ftp_browse","document.group_document_manager",1,1,1,1
-"access_document_ftp_browse","document.ftp.browse group system","model_document_ftp_browse","base.group_system",1,1,1,1
-"access_document_ftp_configuation","document.ftp.configuration document manager","model_document_ftp_configuration","document.group_document_manager",1,1,1,1
-"access_document_ftp_configuation_system","document.ftp.configuration group system","model_document_ftp_configuration","base.group_system",1,1,1,1
 
diff --git a/addons/document_ics/security/ir.model.access.csv b/addons/document_ics/security/ir.model.access.csv
index b17f4507c02..a89c5b296a7 100644
--- a/addons/document_ics/security/ir.model.access.csv
+++ b/addons/document_ics/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_document_directory_ics_fields_all","document.directory.ics.fields all","model_document_directory_ics_fields",,1,0,0,0
 "access_document_directory_ics_fields_manager","document.directory.ics.fields group system","model_document_directory_ics_fields","base.group_system",1,1,1,1
-"access_document_ics_crm_wizard","document.ics.crm.wizard","model_document_ics_crm_wizard","base.group_system",1,1,1,1
\ No newline at end of file
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py
index c959f7204da..6d99e9a4492 100644
--- a/addons/email_template/__init__.py
+++ b/addons/email_template/__init__.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas  
+#    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 email_template_account
 import email_template
 import email_template_mailbox
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index ef50f631e3e..917df3dde70 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -1,7 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas  
+#    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" : "Email Template for Open ERP",
     "version" : "0.7 RC",
-    "author" : "Open ERP",
+    "author" : "Sharoon Thomas, Openlabs",
     "website" : "http://openerp.com",
     "category" : "Added functionality",
     "depends" : ['base'],
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 0ca89a5bbb8..730502bc549 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas  
+#    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 base64
 import random
 import time
@@ -41,7 +63,6 @@ import tools
 import report
 import pooler
 
-
 def get_value(cursor, user, recid, message=None, template=None, context=None):
     """
     Evaluates an expression and returns its value
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 9ea1cd5b8fa..e5bbe0f5e56 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas
+#    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 osv, fields
 from html2text import html2text
 import re
diff --git a/addons/email_template/email_template_engines.py b/addons/email_template/email_template_engines.py
index 2fc58310e9b..cd6aedade39 100644
--- a/addons/email_template/email_template_engines.py
+++ b/addons/email_template/email_template_engines.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas  
+#    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/>.
+#
+##############################################################################
+
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 from osv import fields,osv
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index b20fa9f76bf..d594a01c087 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -1,3 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009  Sharoon Thomas  
+#    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 osv, fields
 import time
 import email_template_engines
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index 958c43f42cd..ddc7533659a 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -2,6 +2,4 @@
 "access_email_template_engines","email_template.engines","model_email_template_engines","email_template.res_groups_email_template_admin",1,1,1,1
 "access_email_template_account","email_template.account","model_email_template_account","email_template.res_groups_email_template_admin",1,1,1,1
 "access_email_template","email.template","model_email_template","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_preview","email_template.preview","model_email_template_preview","email_template.res_groups_email_template_admin",1,1,1,1
 "access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_send_wizard","email_template.send.wizard","model_email_template_send_wizard","email_template.res_groups_email_template_admin",1,1,1,1
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index c1f61bcff8f..7cd7d4ae2c6 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,6 +51,7 @@
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_make_invoice_view.xml',
+        'wizard/partner_event_registration_view.xml',
         'board_association_view.xml',
     ],
     'demo_xml': ['event_demo.xml', 'board_association_demo.xml'],
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index aba85e420d0..157db407ab8 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -13,7 +13,7 @@
                 string="New members"
                 name="%(membership.action_report_partner_member_year_tree)d"
                 view_mode="graph,tree" colspan="4"/>-->
-            
+
         <record model ="ir.ui.view" id="view_report_event_reg_graph">
             <field name="name">Registration Event report</field>
             <field name="model">report.event.registration</field>
@@ -26,15 +26,15 @@
                     <field name="register_max" operator="+"/>
                 </graph>
             </field>
-        </record>     
-                  
+        </record>
+
         <record  model="ir.actions.act_window" id="act_event_reg">
             <field name="name">Events On Registrations</field>
             <field name="res_model">report.event.registration</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_report_event_reg_graph"/>
-        </record>                
+        </record>
 
        <record model="ir.actions.act_window" id="act_event_view">
            <field name="name">Next Events</field>
@@ -42,12 +42,12 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
-       </record>    
-               
+       </record>
+
         <record model="board.note.type" id="note_association_type">
             <field name="name">associations</field>
         </record>
-                              
+
         <record model="ir.ui.view" id="board_associations_manager_form">
             <field name="name">board.associations.manager.form</field>
             <field name="model">board.board</field>
@@ -68,10 +68,10 @@
                         <child2>
                             <action string="Register Events"
                                 name="%(act_event_reg)d"
-                                colspan="4"/>    
-                        
+                                colspan="4"/>
+
                         </child2>
-                        
+
                     </hpaned>
                 </form>
             </field>
@@ -84,8 +84,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem id="board_associations" name="Associations" parent="base.dashboard" />
+        <menuitem id="board_associations" icon="terp-graph" name="Dashboard" parent="menu_report_event" sequence="0"/>
         <menuitem
             name="Associations" parent="board_associations"
             action="open_board_associations_manager"
diff --git a/addons/event/event.py b/addons/event/event.py
index 6a02e44fa89..b74f874e6b5 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -35,7 +35,6 @@ class event_type(osv.osv):
     _columns = {
         'name': fields.char('Event type', size=64, required=True), 
     }
-    
 event_type()
 
 class event_event(osv.osv):    
@@ -44,7 +43,14 @@ class event_event(osv.osv):
     _description = __doc__
     _inherit = 'crm.case.section'
     _order = 'date_begin'
-
+    
+    def _get_currency(self, cr, uid, context):
+        user = self.pool.get('res.users').browse(cr, uid, [uid])[0]
+        if user.company_id:
+            return user.company_id.currency_id.id
+        else:
+            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]    
+        
     def copy(self, cr, uid, id, default=None, context=None):        
         """ Copy record of Given id       
         @param id: Id of Event Registration type record.
@@ -57,6 +63,14 @@ class event_event(osv.osv):
             'state': 'draft'
         })    
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
+    
+    def onchange_product(self, cr, uid, ids, product_id):
+        
+        if not product_id:
+            return {'value': {'unit_price': False}}
+        else:
+           unit_price=self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]
+           return {'value': {'unit_price': unit_price}}
 
     def button_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -88,6 +102,7 @@ class event_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value. 
         """
+        
         register_pool = self.pool.get('event.registration')
         res = {}
         for event in self.browse(cr, uid, ids, context):
@@ -103,11 +118,11 @@ class event_event(osv.osv):
             reg_ids = register_pool.search(cr, uid, [
                        ('event_id', '=', event.id), 
                        ('state', 'in', state)])
+            
             if 'register_current' in fields:
                 res[event.id]['register_current'] = len(reg_ids)
             if 'register_prospect' in fields: 
                 res[event.id]['register_prospect'] = len(reg_ids)
-            
                
         return res
 
@@ -142,6 +157,7 @@ class event_event(osv.osv):
                     register_pool.write(cr, uid, reg_ids, register_values)
         return res
 
+
     _columns = {
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training."), 
         'register_max': fields.integer('Maximum Registrations', help="Provide Maximun Number of Registrations"), 
@@ -157,15 +173,26 @@ class event_event(osv.osv):
         'mail_registr': fields.text('Registration Email', help='This email will be sent when someone subscribes to the event.'), 
         'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."), 
         'product_id': fields.many2one('product.product', 'Product', required=True, help="Product which is provided cost of event. Invoice of event will be created with this Product."),
-        'note': fields.text('Notes', help="Description or Summary of Event")
+        'note': fields.text('Notes', help="Description or Summary of Event"),
+        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        "unit_price": fields.float('Cost'),
+        'partner_id': fields.many2one('res.partner','Teacher'),
+        'address_id': fields.many2one('res.partner.address','Location Room'),
+        'teacher_confirmed': fields.boolean('Teacher Confirmed'),
+        'country_id': fields.related('address_id', 'country_id',
+                    type='many2one', relation='res.country', string='Country'),
+
+        
     }
 
     _defaults = {
         'state': 'draft', 
-        'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
+       # 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'), 
         'user_id': lambda obj, cr, uid, context: uid, 
+        'currency_id': _get_currency,
     }
 
+
 event_event()
 
 class event_registration(osv.osv):    
@@ -192,13 +219,16 @@ and users by email"),
         "invoice_id": fields.many2one("account.invoice", "Invoice"), 
         'date_closed': fields.datetime('Closed', readonly=True), 
         'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
-        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
+        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
+        'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
     }
-    
     _defaults = {
         'nb_register': 1, 
         'tobe_invoiced':  True, 
         'name': 'Registration', 
+     #   'currency_id': _get_currency,
     }
 
     def _make_invoice(self, cr, uid, reg, lines, context=None):
@@ -224,6 +254,7 @@ and users by email"),
                 'reference': False, 
                 'invoice_line': [(6, 0, lines)], 
                 'comment': "", 
+                'date_invoice': context.get('date_inv', False)
             })
         inv_id = inv_pool.create(cr, uid, val_invoice['value'])   
         inv_pool.button_compute(cr, uid, [inv_id])
@@ -235,7 +266,7 @@ and users by email"),
         res = False
         invoices = {}
         tax_ids=[]
-        
+        new_invoice_ids = []
         inv_lines_pool = self.pool.get('account.invoice.line')
         inv_pool = self.pool.get('account.invoice')
         product_pool = self.pool.get('product.product')
@@ -276,6 +307,7 @@ and users by email"),
             invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids))
            
         for val in invoices.values():
+            res = False
             if grouped:
                 res = self._make_invoice(cr, uid, val[0][0], [v for k , v in val], context=context)
                 
@@ -286,7 +318,9 @@ and users by email"),
                for k , v in val:
                    res = self._make_invoice(cr, uid, k, [v], context=context)
                    self.write(cr, uid, [k.id], {'state': 'done', 'invoice_id': res}, context=context)
-        return res
+            if res: new_invoice_ids.append(res)
+                
+        return new_invoice_ids
 
     def check_confirm(self, cr, uid, ids, context=None):
         """
@@ -302,7 +336,7 @@ and users by email"),
             if total_confirmed <= registration.event_id.register_max or registration.event_id.register_max == 0:
                 self.write(cr, uid, [registration.id], {'state': 'open'}, context=context)
                 self.mail_user(cr, uid, [registration.id])           
-                self._history(cr, uid, [registration.id], _('Open')) 
+                self._history(cr, uid, [registration], _('Open')) 
             else:
                 unconfirmed_ids.append(registration.id)
         if unconfirmed_ids:
@@ -343,6 +377,7 @@ and users by email"),
         
         values['date_deadline']= event.date_begin
         values['description']= event.mail_confirm
+        values['currency_id'] =  event.currency_id.id
         res = super(event_registration, self).create(cr, uid, values, context=context)
         registrations = self.browse(cr, uid, [res], context=context)
         self._history(cr, uid, registrations, _('Created'))
@@ -354,7 +389,6 @@ and users by email"),
             values['date_deadline']= event.date_begin
             values['description']= event.mail_confirm
         return super(event_registration, self).write(cr, uid, ids, values, context=context)
-    
 
     def mail_user(self, cr, uid, ids, confirm=False, context=None):
         """
@@ -434,14 +468,16 @@ and users by email"),
             return {'value': {'unit_price': False, 'event_product': False}}
         data_event =  self.pool.get('event.event').browse(cr, uid, event_id)
         
+        context['currency_id'] = data_event.currency_id.id
+        
         if data_event.product_id:
             if not partner_invoice_id:
                 unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
-                return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name}}
+                return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name, 'currency_id': data_event.currency_id.id}}
             data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
             context.update({'partner_id': data_partner})
             unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
-            return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name}}
+            return {'value': {'unit_price': unit_price, 'event_product': data_event.product_id.name, 'currency_id': data_event.currency_id.id}}
         
         return {'value': {'unit_price': False, 'event_product': False}}
 
@@ -489,6 +525,5 @@ and users by email"),
 
 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 1611febcf5e..88927cd0f25 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -58,6 +58,7 @@
 		<field name="date_begin">2008-01-01 19:00:00</field>
 		<field name="date_end">2008-01-01 23:00:00</field>
 		<field name="product_id" ref="event_product_0"/>
+		<field name="unit_price">68.00</field>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
@@ -91,6 +92,7 @@
 		<field name="date_begin">2008-03-05 18:00:00</field>
 		<field name="date_end">2008-03-05 21:00:00</field>
 		<field name="product_id" ref="event_product_1"/>
+		<field name="unit_price">24.00</field>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">350</field>
@@ -102,6 +104,7 @@
 		<field name="date_begin">2008-09-09 14:00:00</field>
 		<field name="date_end">2008-09-09 16:30:00</field>
 		<field name="product_id" ref="event_product_2"/>
+		<field name="unit_price">15.50</field>
 		<field name="type" ref="event_type_2"/>
 		<field name="register_max">200</field>
 		<field name="user_id" ref="base.user_root"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 41c0fef5cfb..20047d00f73 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -51,10 +51,17 @@
                         <field name="user_id" select="1"/>
                         <field name="date_begin" select="1"/>
                         <field name="date_end"/>
-                        <field name="product_id"/>
+                        <field name="product_id" on_change="onchange_product(product_id)"/>
                     </group>
                     <notebook colspan="4">
                     <page string="General">
+                        <field name="unit_price"/>
+                        <field name="currency_id"/>
+                        <separator string="Teacher Information" colspan="4"/>
+                        <field name="partner_id"/>
+                        <field name="address_id"/>
+                        <field name="teacher_confirmed"/>
+                        <field name="country_id" />
                         <separator string="Event description" colspan="4"/>
                         <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
                         <field name="active"/>
@@ -95,6 +102,10 @@
                         <field name="register_current"/>
                         <field name="register_prospect"/>
                     </page>
+                    <page string="Notes">
+                        <separator string="Notes" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
                     </notebook>
             </form>
             </field>
@@ -118,6 +129,34 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="view_event_calendar" model="ir.ui.view">
+            <field name="name">event.event.calendar</field>
+            <field name="model">event.event</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_begin" string="Event Organization">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="type" widget="selection"/>
+                </calendar>
+            </field>
+        </record>
+        
+        
+        <record model="ir.ui.view" id="view_event_graph">
+            <field name="name">Event Graph</field>
+            <field name="model">event.event</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Event by Registration" type="bar" orientation="horizontal">
+                    <field name="name"/>
+                    <field name="register_current" operator="+"/>
+                    <field name="register_prospect" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_event_search">
             <field name="name">Events</field>
@@ -160,7 +199,7 @@
            <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">tree,form</field>
+           <field name="view_mode">tree,form,calendar,graph</field>
            <field name="context">{"search_default_draft": "1"}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
@@ -170,9 +209,18 @@
             name="Registration"
             res_model="event.registration"
             src_model="event.event"
-            view_mode="tree,form"
+            view_mode="tree,form,calendar,graph"
             domain="[('event_id', '=', active_id)]"
             view_type="form"/>
+            
+      <act_window
+            id="act_register_event_partner"
+            name="Subscribe"
+            res_model="event.registration"
+            src_model="res.partner"
+            view_mode="tree,form,calendar,graph"
+            domain="[('partner_id', '=', active_id)]"
+            view_type="form"/>       
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
 
@@ -203,29 +251,32 @@
             <field name="arch" type="xml">
                 <form string="Registration">
                     <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="2"/>
                         <field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="nb_register"/>
-                        <group colspan="2">
-                            <field name="user_id" select="1"/>
-                            <button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
-                        </group>
+                        <field name="user_id" select="1"/>
+                        <newline/>
                         <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
                         <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                        <field name="unit_price"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
+                           <group colspan="4" col="6">
+                                <field name="nb_register"/>
+                                <field name="unit_price"/>
+                                <field name="currency_id"/>
+                            </group>
+                            <separator string="Communication Information" colspan="4"/>
+                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
                             <field name="email_from"/>
-                            <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
                             <newline/>
                             <separator string="Badge" colspan="4"/>
                             <field name="badge_title"/>
                             <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
                             <field name="badge_partner"/>
                             <newline/>
-                            <separator string="Status" colspan="4"/>
                             <group col="8" colspan="4">
+                                <separator string="Status" colspan="4"/>
+                                <newline/>
                                 <field name="state" select="1" colspan="2"/>
                                 <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                 <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
@@ -241,77 +292,97 @@
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="CC"/>
                             </group>
-	                        <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-		                        <form string="Communication history">
-		                            <group col="6" colspan="4">
-		                                <field name="date"/>
-		                                <field name="email_to"/>
-		                                <field name="email_from"/>
-		                            </group>
-		                            <notebook colspan="4">
-		                                <page string="Details">
-		                                    <field name="description" colspan="4" nolabel="1"/>
-		                                </page>
-		                                <page string="Attachments">
-		                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-		                                </page>
-		                            </notebook>
-		                            <button colspan="4"
-		                            string="Reply to Last Email"
-		                            name="%(crm.action_crm_send_mail)d"
-		                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-		                            icon="gtk-undo" type="action" />
-		                        </form>
-		                        <tree string="Communication history">
-		                            <field name="date"/>
-		                            <field name="email_from" />
-		                            <field name="email_to"/>
-		                            <field name="description"/>
-		                        </tree>
-	                           </field>
-	                          <button colspan="4" string="Send New Email"
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
+                               </field>
+                              <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'event.registration'}"
                                 icon="gtk-go-forward" type="action" />
-	                       </page>
-	                       <page string="History">
-	                            <group colspan="4"> 
-	                               <field name="name" select="1" colspan="4"/>
-	                            </group>   
-	                            <group col="2" colspan="2">
-	                               <separator string="Dates" colspan="2"/>
-	                               <field name="create_date"/>
-	                               <field name="date_closed"/>
-	                            </group>
-	                            <group col="2" colspan="2">
+                           </page>
+                           <page string="History">
+                                <group col="2" colspan="2">
+                                   <separator string="Dates" colspan="2"/>
+                                   <field name="create_date"/>
+                                   <field name="date_closed"/>
+                                </group>
+                                <group col="2" colspan="2">
                                    <separator string="Misc" colspan="2"/>
                                    <field name="id"/>
                                    <field name="active"/>
                                 </group>
-	                            <group col="3" colspan="4">
-	                                <separator colspan="4" string="References"/>
-	                                <field name="ref" />
-	                                <field name="ref2" />
-	                            </group>
-	                            <!-- TODO-->
-	                           <field name="log_ids" nolabel="1" colspan="4">
-	                                <tree string="Logs">
-	                                    <field name="name" colspan="4"/>
-	                                    <field name="date"/>
-	                                    <field name="user_id"/>
-	                                </tree>
-	                                <form string="Logs">
-	                                    <separator string="Action Information" colspan="4"/>
-	                                    <field name="name" colspan="4"/>
-	                                    <field name="date"/>
-	                                    <field name="user_id"/>
-	                                </form>
-	                            </field>
-	                        </page>
+                                <!-- TODO-->
+                               <field name="log_ids" nolabel="1" colspan="4">
+                                    <tree string="Logs">
+                                        <field name="name" colspan="4"/>
+                                        <field name="date"/>
+                                        <field name="user_id"/>
+                                    </tree>
+                                    <form string="Logs">
+                                        <separator string="Action Information" colspan="4"/>
+                                        <field name="name" colspan="4"/>
+                                        <field name="date"/>
+                                        <field name="user_id"/>
+                                    </form>
+                                </field>
+                            </page>
                     </notebook>
                 </form>
             </field>
         </record>
+        
+ <!-- Calendar view of event registration -->       
+        
+        <record id="view_event_registration_calendar" model="ir.ui.view">
+            <field name="name">event.registration.calendar</field>
+            <field name="model">event.registration</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="event_id" date_start="create_date" string="Event Registration">
+                    <field name="event_id"/>
+                    <field name="partner_invoice_id"/>
+                </calendar>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_event_registration_graph">
+            <field name="name">Registration Graph</field>
+            <field name="model">event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Registration" type="bar" orientation="horizontal">
+                    <field name="event_id"/>
+                    <field name = "nb_register" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        
 
 <!-- Search view of event registration form-->
 
@@ -322,8 +393,8 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
-                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
+                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Current Registrations"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
@@ -353,7 +424,7 @@
           <field name="res_model">event.registration</field>
           <field name="view_type">form</field>
           <field name="domain"></field>
-          <field name="view_mode">tree,form</field>
+          <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{"search_default_draft": "1"}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 4559c5b1ada..05c2d723edd 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
index d1a479535bc..c5bee3a64d0 100644
--- a/addons/event/test/test_event.yml
+++ b/addons/event/test/test_event.yml
@@ -63,6 +63,7 @@
     register_min: 0.0
     state: draft
     type: 'event_type_conference0'
+    reply_to: 'info@customer.com'
     
 - |
   we  set the limit of registrations to this event using "Minimum Registrations"  2 and "Maximum Registrations" 10
@@ -172,18 +173,6 @@
      obj_event = self.browse(cr, uid, [ref('event_event_conference0')])[0]
      assert  obj_event.register_current == '2'
      assert obj_event.register_prospect == '1'
-    
-- |
-  We check all registered partners to this event using the wizard "List Register Partners".
-- 
-  !record {model: event.partners.list, id: event_partners_list_0}:
-    {}
-- 
-  I click on "Open Partners" button of "List Register Partners" wizard.
-- 
-  !python {model: event.partners.list}: |
-    self.list_partners(cr, uid, [ref("event_partners_list_0")], {"active_ids":
-      [ref("event.event_event_conference0")]})
 
 - |
   This event is finished by click on "Event Done" button of this event form.
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 65a08570bbf..945e5f84607 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 import event_make_invoice
 import event_confirm_registration
+import partner_event_registration
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index cbf6659acb7..ab446f67ef6 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -83,7 +83,7 @@ class event_make_invoice(osv.osv_memory):
         id = mod_obj.read(cr, uid, result, ['res_id'])  
            
         return {
-            'domain': "[('id','=',%s)]" % res, 
+            'domain': "[('id','in',%s)]" % res, 
             'name': 'Invoices',
             'view_type': 'form',
             'view_mode': 'tree,form',
@@ -95,4 +95,4 @@ class event_make_invoice(osv.osv_memory):
         }
         
 event_make_invoice()
-# 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/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
index 68a07ceeee8..ce9a9e2375f 100644
--- a/addons/event/wizard/event_make_invoice_view.xml
+++ b/addons/event/wizard/event_make_invoice_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Create invoices">
-                <separator colspan="4" string="Do you really want to create the invoices ?" />
+                <separator colspan="4" string="Do you really want to create the invoice(s) ?" />
                 <field name="grouped" />
                 <field name="invoice_date"/>
                 <group colspan="4">
@@ -38,4 +38,4 @@
     		view_mode="form" target="new"  view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
new file mode 100644
index 00000000000..d78d57f83da
--- /dev/null
+++ b/addons/event/wizard/partner_event_registration.py
@@ -0,0 +1,142 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import tools
+from osv import fields, osv
+from tools.translate import _
+
+
+class partner_event_registration(osv.osv_memory):
+    """  event Registration """
+
+    _name = "partner.event.registration"
+    _description = __doc__
+    _order = 'event_id'
+
+    _columns = {
+        'event_id': fields.many2one('event.event', 'Event'),
+        'event_type': fields.many2one('event.type', 'Type', readonly=True),
+        'unit_price': fields.float('Cost', readonly=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True), 
+        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True), 
+        'nb_register': fields.integer('Number of Registration'),
+    }
+    _defaults = {
+        'nb_register': 1, 
+    }
+
+    def open_registration(self, cr, uid, ids, context=None):
+        value = {}
+        res_obj = self.pool.get('res.partner')
+        record_ids = context and context.get('active_ids', []) or []
+        addr = res_obj.address_get(cr, uid, record_ids)
+        contact_id = False
+        email = False
+        if addr.has_key('default'):
+                job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id', '=', addr['default'])])
+                if job_ids:
+                    contact = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0])
+                    if contact:
+                        contact_id = contact.contact_id.id
+                        email = contact.email
+                         
+        event_obj = self.pool.get('event.event')
+        reg_obj = self.pool.get('event.registration')
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'event', 'view_registration_search')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+
+        data_obj = self.pool.get('ir.model.data')
+        # Select the view
+        id2 = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
+        id3 = data_obj._get_id(cr, uid, 'event', 'view_event_registration_tree')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for current in self.browse(cr, uid, ids, context=context):
+            for reg in reg_obj.browse(cr, uid, record_ids, context=context):
+                new_case = reg_obj.create(cr, uid, {
+                        'name' : 'Registration',
+                        'event_id' : current.event_id and current.event_id.id or False,
+                        'unit_price' : current.event_id.unit_price,
+                        'currency_id' : current.event_id.currency_id and current.event_id.currency_id.id or False,
+                        'partner_id' : record_ids[0],
+                        'partner_invoice_id' :  record_ids[0] or False,
+                        'event_product': current.event_id.product_id.name,
+                        'contact_id': contact_id,
+                        'email_from': email,
+                        'nb_register': current.nb_register,
+ 
+                }, context=context)
+
+            value = {
+                'name': _('Event Registration'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'event.registration',
+                'res_id' : new_case,
+                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id']
+            }
+        return value
+    
+    def name_get(self, cr, uid, ids, context=None):
+        """Overrides orm name_get method
+        @param ids: List of partner_event_register ids
+        """
+        if not context:
+            context = {}
+        
+        res = []
+        if not ids:
+            return res
+        reads = self.read(cr, uid, ids, ['event_type', 'event_id'], context)
+        for record in reads:
+            event_id = record['event_id'][1]
+            if record['event_type']:
+                event_id = record['event_type'][1] + ' on ' + event_id
+            res.append((record['id'], event_id))
+        return res
+    
+    def onchange_event_id(self, cr, uid, ids, event_id, context={}):
+        res = {}    
+        if event_id:   
+            obj_event = self.pool.get('event.event')
+            event = obj_event.browse(cr, uid, event_id)
+            res['value'] = {
+                          'event_type': event.type and event.type.id or False,
+                          'start_date': event.date_begin,
+                          'end_date': event.date_end,
+                          'unit_price': event.unit_price,
+                          'currency_id': event.currency_id and event.currency_id.id or False
+                           }
+        return res
+    
+partner_event_registration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/event/wizard/partner_event_registration_view.xml b/addons/event/wizard/partner_event_registration_view.xml
new file mode 100644
index 00000000000..4efb1733942
--- /dev/null
+++ b/addons/event/wizard/partner_event_registration_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!-- Partner event registration -->
+
+        <record id="view_partner_event_registration" model="ir.ui.view">
+            <field name="name">Partner event registration</field>
+            <field name="model">partner.event.registration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Event Registration">
+                    <separator string="Event For Registration" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <field name="event_id"  on_change="onchange_event_id(event_id, context)"/>
+                        <field name="nb_register"/>
+                    </group>
+                    <separator string="Event Details" colspan="4"/>
+                     <group colspan="4" col="4">    
+                        <field name="start_date"/>
+                        <field name="end_date"/>
+                        <field name="event_type"/>
+                        <group colspan="2" col="3">
+                            <field name="unit_price"/>
+                            <field name="currency_id" nolabel="1"/>
+                        </group>
+                    </group>    
+                    
+                   
+                    <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                        <button name="open_registration" string="_Subcribe" type="object" icon="gtk-go-back"/>
+                    </group>
+             </form>
+            </field>
+        </record>
+
+       <act_window name="Event Registration"
+            res_model="partner.event.registration"
+            src_model="res.partner"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_partner_event_registration"
+            />
+    </data>
+</openerp>
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index 51be1e29113..20edb735496 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -31,7 +31,7 @@
     'author': 'Tiny',
     'depends': ['project_retro_planning', 'event'],
     'init_xml': [],
-    'update_xml': ['event_wizard.xml', 'event_view.xml'],
+    'update_xml': ['wizard/event_project_view.xml', 'event_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/event_project/event_view.xml b/addons/event_project/event_view.xml
index 86887faf1d6..45baae0f846 100644
--- a/addons/event_project/event_view.xml
+++ b/addons/event_project/event_view.xml
@@ -13,7 +13,7 @@
                 <field name="register_max" position="after">
                     <separator string="Tasks management" colspan="4"/>
                     <field name="project_id"/>
-                    <button string="Create Retro-Planning" name="%(event_wiz)d" type="action" icon="gtk-execute"/>
+                    <button string="Create Retro-Planning" name="%(action_event_project)d" type="action" icon="gtk-execute"/>
                 </field>
             </field>
         </record>
@@ -39,6 +39,15 @@
                 </field>
             </field>
         </record>
+        
+      <act_window
+            id="act_event_task"
+            name="Tasks"
+            res_model="project.task"
+            src_model="event.event"
+            view_mode="tree,form,calendar,graph"
+            domain="[('project_id', '=', project_id)]"
+            view_type="form"/>            
 
     </data>
 </openerp>
diff --git a/addons/event_project/event_wizard.xml b/addons/event_project/event_wizard.xml
index f6cc672c46a..3ba8df59b13 100644
--- a/addons/event_project/event_wizard.xml
+++ b/addons/event_project/event_wizard.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <wizard string="Project"
-            model="event.event"
-            name="event.project"
-            id="event_wiz"
-            menu="False"/>
-
-        <wizard
-            string="Tasks"
-            model="event.event"
-            name="wizard_event_tasks"
-            id="wizard_event_task"/>
-
 
     </data>
 </openerp>
diff --git a/addons/event_project/wizard/__init__.py b/addons/event_project/wizard/__init__.py
index a6ed912e137..470e9edbb8b 100644
--- a/addons/event_project/wizard/__init__.py
+++ b/addons/event_project/wizard/__init__.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import project_wizard
-import event_task
+import event_project
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/event_project/wizard/event_project.py b/addons/event_project/wizard/event_project.py
new file mode 100644
index 00000000000..111696bb576
--- /dev/null
+++ b/addons/event_project/wizard/event_project.py
@@ -0,0 +1,58 @@
+# -*- 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/>.
+#
+##############################################################################
+
+#
+# Order Point Method:
+#   - Order if the virtual stock of today is bellow the min of the defined order point
+#
+
+from osv import fields, osv
+from tools.translate import _
+import time
+ 
+class event_project(osv.osv_memory):
+    """
+    Event Project
+    """
+    _name = "event.project"
+    _description = "Event Project"
+
+    _columns = {
+             'project_id': fields.many2one('project.project', 'Template of Project', domain = [('active', '<>', False), ('state', '=', 'template')], required =True, help="This is Template Project. Project of event is a duplicate of this Template. After click on  'Create Retro-planning', New Project will be duplicated from this template project.")             
+     }
+    
+    def create_duplicate(self, cr, uid, ids, context):
+        event_obj=self.pool.get('event.event')
+        project_obj = self.pool.get('project.project')
+        event = event_obj.browse(cr, uid, context.get('active_id', False))
+        for current in self.browse(cr, uid, ids): 
+            duplicate_project_id = project_obj.copy(cr, uid, current.project_id.id, {'active': True})
+            duplicate_project = project_obj.browse(cr, uid, duplicate_project_id, context)
+            project_obj.write(cr, uid, [duplicate_project_id], {
+                    'name': duplicate_project.name , 
+                    'date_start':time.strftime('%Y-%m-%d'), 
+                    'date': event.date_begin[0:10] })
+            event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
+            
+        return {}
+   
+event_project()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_project/wizard/event_project_view.xml b/addons/event_project/wizard/event_project_view.xml
new file mode 100644
index 00000000000..b9a7e1273b9
--- /dev/null
+++ b/addons/event_project/wizard/event_project_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_event_project" model="ir.ui.view">
+            <field name="name">Retro-Planning</field>
+            <field name="model">event.project</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Retro-Planning">
+                    <field name="project_id" />
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button  icon="gtk-close" special="cancel" string="Close"/>
+                        <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
+                    </group>
+              </form>
+            </field>
+        </record>
+
+        <record id="action_event_project" model="ir.actions.act_window">
+            <field name="name">Retro-Planning</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.project</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_event_project"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/event_project/wizard/event_task.py b/addons/event_project/wizard/event_task.py
deleted file mode 100644
index bdf2651e6a4..00000000000
--- a/addons/event_project/wizard/event_task.py
+++ /dev/null
@@ -1,62 +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 wizard
-import pooler
-from tools.translate import _
-
-def _event_tasks(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    event_id = data['id']
-    cr.execute('SELECT project_id FROM event_event WHERE id = %s', (event_id, ))
-    res = cr.fetchone()
-    if not res[0]:
-        raise wizard.except_wizard(_('Error !'), _('No project defined for this event.\nYou can create one with the retro-planning button !'))
-    value = {
-        'domain': [('project_id', '=', res[0])],
-        'name': 'Tasks',
-        'view_type': 'form',
-        'view_mode': 'tree,form,calendar',
-        'res_model': 'project.task',
-        'context': { },
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']         
-    }
-    return value
-
-class wizard_event_tasks(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _event_tasks,
-                'state': 'end'
-            }
-        },
-    }
-wizard_event_tasks("wizard_event_tasks")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/event_project/wizard/project_wizard.py b/addons/event_project/wizard/project_wizard.py
deleted file mode 100644
index 872cb073712..00000000000
--- a/addons/event_project/wizard/project_wizard.py
+++ /dev/null
@@ -1,67 +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/>.
-#
-##############################################################################
-
-#
-# Order Point Method:
-#   - Order if the virtual stock of today is bellow the min of the defined order point
-#
-
-import wizard
-import pooler
-
-import time
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Event" colspan="4">
-    <field name="project_id"
-/>
-</form>'''
-
-parameter_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'required':True, 'relation':'project.project', 'domain': [('active','<>',False),('state','=','template')]},
-}
-
-def _create_duplicate(self, cr, uid, data, context):
-    event_obj=pooler.get_pool(cr.dbname).get('event.event')
-    project_obj = pooler.get_pool(cr.dbname).get('project.project')
-    duplicate_project_id= project_obj.copy(cr, uid, data['form']['project_id'], {'active': True})
-    project_obj.write(cr, uid, [duplicate_project_id], {'name': "copy of " + project_obj.browse(cr, uid, duplicate_project_id, context).name , 'date_start':time.strftime('%Y-%m-%d'),'date': event_obj.browse(cr, uid, [data['id']])[0].date_begin[0:10] })
-    event_obj.write(cr, uid, [data['id']], {'project_id': duplicate_project_id })
-    return {}
-
-class wizard_event_project(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('done', 'Ok')]}
-
-        },
-        'done':{
-                'actions':[_create_duplicate],
-                'result' : {'type':'state', 'state':'end'}
-                }
-    }
-wizard_event_project('event.project')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index d4778237420..29e61ba5599 100755
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Human Resources",
-    "version" : "1.1",
-    "author" : "Tiny",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
+    "name": "Human Resources",
+    "version": "1.1",
+    "author": "Tiny",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
     "description": """
     Module for human resource management. You can manage:
     * Employees and hierarchies : You can define your employee with User and display hierarchies
@@ -45,10 +45,11 @@
         'hr_installer.xml',
         'hr_data.xml',
         'board_hr_view.xml',
-    ],
-    'demo_xml': ['hr_demo.xml',
-        'hr_department_demo.xml'],
-        
+        ],
+    'demo_xml': [
+        'hr_demo.xml',
+        'hr_department_demo.xml'
+        ],        
     'test': ['test/test_hr.yml'],    
     'installable': True,
     'active': False,
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index fdbd4f87d2e..873032a4067 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -32,12 +32,13 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_hr_form"/>
         </record>
-
+		<menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+		<menuitem icon="terp-graph" id="menu_hr_dasboard" name="Dashboard" parent="menu_hr_reporting" sequence="0"/>
         <menuitem
             action="open_board_hr"
             icon="terp-graph"
             id="menu_hr_project"
-            parent="menu_hr_deshboard"
+            parent="menu_hr_dasboard"
             sequence="4"/>
     </data>
 </openerp>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 34c5b9ede9a..372b5214f6f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -27,9 +27,8 @@ from tools.translate import _
 class hr_employee_category(osv.osv):
     _name = "hr.employee.category"
     _description = "Employee Category"
-
     _columns = {
-        'name' : fields.char("Category", size=64, required=True),
+        'name': fields.char("Category", size=64, required=True),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
@@ -37,7 +36,7 @@ class hr_employee_category(osv.osv):
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
-            cr.execute('select distinct parent_id from hr_employee_category where id IN %s',(tuple(ids),))
+            cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), ))
             ids = filter(None, map(lambda x:x[0], cr.fetchall()))
             if not level:
                 return False
@@ -54,13 +53,14 @@ class hr_employee_marital_status(osv.osv):
     _name = "hr.employee.marital.status"
     _description = "Employee Marital Status"
     _columns = {
-        'name' : fields.char('Marital Status', size=30, required=True),
-        'description' : fields.text('Status Description'),
+        'name': fields.char('Marital Status', size=30, required=True),
+        'description': fields.text('Status Description'),
     }
 hr_employee_marital_status()
 
 class hr_job(osv.osv):
-    def _no_of_employee(self, cr, uid, ids, name,args,context=None):
+
+    def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
         for emp in self.browse(cr, uid, ids):
             res[emp.id] = len(emp.employee_ids or [])
@@ -70,19 +70,19 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees':fields.integer('Expected Employees'),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer'),
-        'employee_ids':fields.one2many('hr.employee', 'job_id','Employees'),
+        'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'),
+        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
+        'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
-        'requirements':fields.text('Requirements'),
-        'department_id':fields.many2one('hr.department','Department'),
+        'requirements': fields.text('Requirements'),
+        'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open','Open'),('old','Old'),('recruit','In Recruitement')], 'State', required=True),
+        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', required=True),
     }
     _defaults = {
-        'expected_employees': lambda *a: 1,
+        'expected_employees': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
-        'state': lambda *args: 'open'
+        'state': 'open'
     }
 
 hr_job()
@@ -90,17 +90,17 @@ hr_job()
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
-    _inherits = {'resource.resource':"resource_id"}
+    _inherits = {'resource.resource': "resource_id"}
     _columns = {
-        'country_id' : fields.many2one('res.country', 'Nationality'),
-        'birthday' : fields.date("Birthday"),
+        'country_id': fields.many2one('res.country', 'Nationality'),
+        'birthday': fields.date("Birthday"),
         'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
         'sinid': fields.char('SIN No', size=32),
         'otherid': fields.char('Other ID', size=32),
-        'gender': fields.selection([('male','Male'),('female','Female')], 'Gender'),
+        'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'bank_account': fields.char('Bank Account', size=56),
-        'partner_id' : fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
+        'partner_id': fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
         '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'),
@@ -109,8 +109,8 @@ class hr_employee(osv.osv):
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-        'category_id' : fields.many2one('hr.employee.category', 'Category'),
-        'child_ids': fields.one2many('hr.employee', 'parent_id','Subordinates'),
+        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
         'coach_id': fields.many2one('res.users', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
@@ -123,7 +123,7 @@ class hr_employee(osv.osv):
                     'rb') .read().encode('base64')
 
     _defaults = {
-        'active' : 1,
+        'active': 1,
         'photo': _get_photo,
     }
 
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 7125afb17d4..f76d1457aa1 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <!-- Employee Marital Statusses -->
         <record id="hr_employee_marital_status_single" model="hr.employee.marital.status">
             <field name="name">Single</field>
@@ -14,5 +15,6 @@
         <record id="hr_employee_marital_status_widower" model="hr.employee.marital.status">
             <field name="name">Widower</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 9e190a2b0f7..d1e13e2f6ec 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -25,6 +25,8 @@ import tools
 class hr_department(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if not len(ids):
             return []
         reads = self.read(cr, uid, ids, ['name','parent_id'], context)
@@ -36,7 +38,7 @@ class hr_department(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
+    def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = self.name_get(cr, uid, ids, context)
         return dict(res)
 
@@ -51,13 +53,19 @@ class hr_department(osv.osv):
         'manager_id': fields.many2one('res.users', 'Manager', required=True),
         'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
     }
-    def _get_members(self,cr, uid, context={}):
-        mids = self.search(cr, uid, [('manager_id','=',uid)])
+    
+    _defaults = { 
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.department', context=c),
+  }    
+
+    def _get_members(self,cr, uid, context=None):
+        mids = self.search(cr, uid, [('manager_id', '=', uid)])
         result = {uid:1}
         for m in self.browse(cr, uid, mids, context):
             for user in m.member_ids:
                 result[user.id] = 1
         return result.keys()
+
     def _check_recursion(self, cr, uid, ids):
         level = 100
         while len(ids):
@@ -78,18 +86,17 @@ hr_department()
 class ir_action_window(osv.osv):
     _inherit = 'ir.actions.act_window'
 
-    def read(self, cr, uid, ids, fields=None, context=None,
-            load='_classic_read'):
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        if context is None:
+            context = {}
         select = ids
         if isinstance(ids, (int, long)):
             select = [ids]
-        res = super(ir_action_window, self).read(cr, uid, select, fields=fields,
-                context=context, load=load)
+        res = super(ir_action_window, self).read(cr, uid, select, fields=fields, context=context, load=load)
         for r in res:
             mystring = 'department_users_get()'
             if mystring in (r.get('domain', '[]') or ''):
-                r['domain'] = r['domain'].replace(mystring, str(
-                    self.pool.get('hr.department')._get_members(cr, uid)))
+                r['domain'] = r['domain'].replace(mystring, str(self.pool.get('hr.department')._get_members(cr, uid)))
         if isinstance(ids, (int, long)):
             if res:
                 return res[0]
@@ -103,7 +110,7 @@ class res_users(osv.osv):
     _inherit = 'res.users'
     _description = 'User'
 
-    def _parent_compute(self, cr, uid, ids, name, args, context={}):
+    def _parent_compute(self, cr, uid, ids, name, args, context=None):
         result = {}
         obj_dept = self.pool.get('hr.department')
         for user_id in ids:
@@ -125,10 +132,12 @@ class res_users(osv.osv):
             return [('id', 'in', [0])]
         return [('id', 'in', child_ids.get(uid,[]))]
 
-    def _child_compute(self, cr, uid, ids, name, args, context={}):
+    def _child_compute(self, cr, uid, ids, name, args, context=None):
         obj_dept = self.pool.get('hr.department')
         obj_user = self.pool.get('res.users')
         result = {}
+        if context is None:
+            context = {}
         for manager_id in ids:
             child_ids = []
             mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
@@ -137,10 +146,9 @@ class res_users(osv.osv):
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
                 childs = map(lambda x: x['member_ids'], data_dept)
                 childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id','in',childs),('active','=',True)])
+                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)])
                 if manager_id in childs:
                     childs.remove(manager_id)
-
                 child_ids.extend(tools.flatten(childs))
                 set = {}
                 map(set.__setitem__, child_ids, [])
@@ -150,7 +158,7 @@ class res_users(osv.osv):
             result[manager_id] = child_ids
         return result
 
-    def _child_search(self, cr, uid, obj, name, args, context):
+    def _child_search(self, cr, uid, obj, name, args, context=None):
         parent = []
         for arg in args:
             if arg[0] == 'child_ids':
@@ -161,9 +169,11 @@ class res_users(osv.osv):
         return [('id', 'in', child_ids.get(uid,[]))]
 
     _columns = {
-        'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
+        'parent_id': fields.function(_parent_compute, relation='res.users', fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
         'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search, method=True, string="Subordinates", type='many2many'),
         'context_department_id': fields.many2one('hr.department', 'Departments'),
     }
+
 res_users()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 70576149592..c0b2e3c53c7 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -49,9 +49,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <group col='4' colspan='2'>
-                        <field name="name" />
-                        <field name="manager_id"/>
+                    <field name="name"/>
+                    <field name="manager_id" />
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 6859150e855..c0d388517eb 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
+
     <record id="view_hr_installer" model="ir.ui.view">
       <field name="name">hr.installer.view</field>
       <field name="model">hr.installer</field>
@@ -7,20 +9,18 @@
       <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">Select Human Resources Modules To Install</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Select Human Resources Modules To Install</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
+            <form position="attributes">
+                <attribute name="string">Select Human Resources Modules To Install</attribute>
+            </form>
+            <separator string="title" position="attributes">
+                <attribute name="string">Select Human Resources Modules To Install</attribute>
+            </separator>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
-           </xpath>
-           <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
-          </xpath>
+            </xpath>
+            <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
+            </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
@@ -51,16 +51,18 @@
       <field name="action_id" ref="action_hr_installer"/>
       <field name="sequence">3</field>
     </record>
-   <record id="hr_ir_actions_todo_tree" model="ir.ui.view">
-    <field name="model">ir.actions.todo</field>
-    <field name="name">hr_installer_action_replace</field>
-    <field name="type">tree</field>
-    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-    <field name="arch" type="xml">
+
+    <record id="hr_ir_actions_todo_tree" model="ir.ui.view">
+        <field name="model">ir.actions.todo</field>
+        <field name="name">hr_installer_action_replace</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+        <field name="arch" type="xml">
            <xpath expr="//button[@string='Launch']" position="replace">
             <button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
               </xpath>
-          </field>
+        </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f6add4a07ed..161064723f9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,32 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            id="menu_hr_root"
-            icon="terp-hr"
-            name="Human Resources"
-            sequence="15"/>
-        <menuitem
-            id="menu_hr_main"
-            parent="menu_hr_root"
-            name="Human Resources Management"
-            sequence="0"/>
-        <menuitem
-            id="menu_hr_configuration"
-            name="Configuration"
-            parent="hr.menu_hr_root"
-            groups="group_hr_manager"
-            sequence="50" />
-        <menuitem
-            id="menu_hr_management"
-            name="Human Resources Management"
-            parent="hr.menu_hr_configuration"
-            groups="group_hr_manager"
-            sequence="1" />
-        <menuitem
-            id="menu_view_employee_category_configuration_form"
-            parent="hr.menu_hr_management"
-            name="Employees"
+
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
+        <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="group_hr_manager"    sequence="50" />
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration"       groups="group_hr_manager" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees"
             sequence="1"/>
 
         <!--
@@ -42,50 +22,50 @@
                 <form string="Employee">
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
-                            <field colspan="6" name="name" select="1"/>
-                            <field name="user_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active" groups="base.group_extended"/>
-                            <newline/>
-                            <field name="parent_id" />
-                            <field name="coach_id" />
+                        <field colspan="6" name="name" />
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="active" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="parent_id" />
+                        <field name="coach_id" />
                         </group>
                         <group colspan="2" col="1">
-                            <field name="photo" widget='image' nolabel="1"/>
+                        <field name="photo" widget='image' nolabel="1"/>
                         </group>
                     </group>
                     <notebook colspan="6">
                         <page string="Personal Information">
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid" groups="base.group_extended"/>
-                                <field name="otherid" groups="base.group_extended"/>
+                            <separator colspan="2" string="Social IDs"/>
+                            <field name="ssnid"/>
+                            <field name="sinid" groups="base.group_extended"/>
+                            <field name="otherid" groups="base.group_extended"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Status" colspan="2"/>
-                                <field name="gender"/>
-                                <field name="marital" widget="selection"/>
-                                <field name="country_id"/>
-                                <field name="birthday"/>
+                            <separator string="Status" colspan="2"/>
+                            <field name="gender"/>
+                            <field name="marital" widget="selection"/>
+                            <field name="country_id"/>
+                            <field name="birthday"/>
                             </group>
                             <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" domain="[('partner_id', '=', partner_id)]"/>
-                                <field name="work_phone"/>
-                                <field name="work_email" widget="email" />
-                                <field name="work_location"/>
+                            <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" domain="[('partner_id', '=', partner_id)]"/>
+                            <field name="work_phone"/>
+                            <field name="work_email" widget="email" />
+                            <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                                <separator string="Position" colspan="2"/>
-                                <field name="job_id" widget="selection"/>
-                                <field name="department_id" widget="selection"/>
-                                <field name="category_id" />
-                                <!--<separator string="Managers" colspan="2"/>
-                                <field name="parent_id" />
-                                <field name="coach_id" />-->
+                            <separator string="Position" colspan="2"/>
+                            <field name="job_id" widget="selection"/>
+                            <field name="department_id" widget="selection"/>
+                            <field name="category_id" />
+                            <!--<separator string="Managers" colspan="2"/>
+                            <field name="parent_id" />
+                            <field name="coach_id" />-->
                             </group>
                         </page>
                         <page string="Notes">
@@ -112,30 +92,30 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_employee_filter" model="ir.ui.view">
             <field name="name">Employees</field>
             <field name="model">hr.employee</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
-                        groups="base.group_extended"/>
-                    <separator orientation="vertical" />
+                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
-                        <separator orientation="vertical" />
-                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
+                    <separator orientation="vertical" />
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
                 </search>
              </field>
          </record>
+
         <record id="open_view_employee_tree" model="ir.actions.act_window">
             <field name="name">Employees Structure</field>
             <field name="res_model">hr.employee</field>
@@ -154,7 +134,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-       <record id="open_view_employee_list_my" model="ir.actions.act_window">
+
+        <record id="open_view_employee_list_my" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
@@ -163,17 +144,14 @@
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-        <menuitem
-            action="open_view_employee_list_my"
-            id="menu_open_view_employee_list_my"
-            sequence="3"
-            parent="menu_hr_main"/>
 
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <!--
         =======================
         Employee marital status
-        =======================     -->
+        =======================    
+        -->
 
         <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status</field>
@@ -181,7 +159,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Marital Status">
-                    <field colspan="4" name="name" nolabel="1" select="1"/>
+                    <field name="name"/>
+                    <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
@@ -194,17 +173,15 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            action="action_hr_marital_status"
-            id="hr_menu_marital_status"
+        <menuitem action="action_hr_marital_status" id="hr_menu_marital_status"
             parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
 
-
         <!--
         =======================
         Employee architecture
         =======================
         -->
+
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
@@ -216,10 +193,10 @@
                     <field name="ssnid"/>
                     <field name="user_id"/>
                     <field name="address_id"/>
-
                 </tree>
             </field>
         </record>
+
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Employee Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
@@ -228,6 +205,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_partner_tree2"/>
         </record>
+
         <ir_set>
             <field eval="'action'" name="key"/>
             <field eval="'client_action_multi'" name="key2"/>
@@ -250,11 +228,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
-                    <field name="name" select="1"/>
-                    <field name="parent_id" select="1"/>
+                    <field name="name" />
+                    <field name="parent_id" />
                 </form>
             </field>
         </record>
+
         <record id="view_employee_category_list" model="ir.ui.view">
             <field name="name">hr.employee.category.list</field>
             <field name="model">hr.employee.category</field>
@@ -267,6 +246,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_employee_category_tree" model="ir.ui.view">
             <field name="name">hr.employee.category.tree</field>
             <field name="model">hr.employee.category</field>
@@ -278,6 +258,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_categ_form" model="ir.actions.act_window">
             <field name="name">Categories of Employee</field>
             <field name="res_model">hr.employee.category</field>
@@ -285,10 +266,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="open_view_categ_form"
-            id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1"
-            groups="base.group_extended"/>
+        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -316,9 +295,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem
-            action="open_view_categ_tree"
-            groups="base.group_extended"
+        <menuitem action="open_view_categ_tree" groups="base.group_extended"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
@@ -328,11 +305,11 @@
             <field name="arch" type="xml">
                 <form string="Job">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="department_id" select="1"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="expected_employees"/>
-                        <field name="no_of_employee"/>
+                    <field name="name" />
+                    <field name="department_id" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="expected_employees"/>
+                    <field name="no_of_employee"/>
                     </group>
                     <newline/>
                     <notebook colspan="4">
@@ -350,13 +327,14 @@
                 </form>
             </field>
         </record>
+
         <record id="view_hr_job_tree" model="ir.ui.view">
             <field name="name">hr.job.tree</field>
             <field name="model">hr.job</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
-                    <field name="name" select="1"/>
+                    <field name="name" />
                     <field name="department_id" />
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
@@ -364,35 +342,28 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_job_filter" model="ir.ui.view">
             <field name="name">Job</field>
             <field name="model">hr.job</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <filter icon="terp-check"
-                        domain="[('state','in',('open','recruit'))]"
-                        string="Current"
+                    <filter icon="terp-check" domain="[('state','in',('open','recruit'))]" string="Current"
                         help="Open and in recruitment positions"/>
-                    <filter icon="terp-personal+"
-                        domain="[('state','=','recruit')]"
-                        string="Recruitment"
+                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="Recruitment"
                         help="In Recruitment"/>
-                    <filter icon="terp-camera_test"
-                        domain="[('state','=','open')]"
-                        string="Open"
+                    <filter icon="terp-camera_test" domain="[('state','=','open')]" string="Open"
                         help="Open Positions"/>
-
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                     <field name="department_id" widget="selection">
-                            <filter icon="terp-gtk-select-all"
-                            domain="[('department_id','=',context.get('department_id',False))]"
-                            help="My Departments Jobs"/>
+                    <field name="department_id" widget="selection">
+                            <filter icon="terp-gtk-select-all" domain="[('department_id','=',context.get('department_id',False))]" help="My Departments Jobs"/>
                     </field>
                 </search>
              </field>
          </record>
+
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
@@ -400,14 +371,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            name="Recruitment"
-            id="base.menu_crm_case_job_req_main"
-            parent="menu_hr_root"/>
-        <menuitem
-            parent="base.menu_crm_case_job_req_main"
-            id="menu_hr_job"
-            action="action_hr_job" sequence="2"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
+        <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index bc3dd7d0b71..277a315edac 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -23,29 +23,28 @@ from osv import fields, osv
 class hr_installer(osv.osv_memory):
     _name = 'hr.installer'
     _inherit = 'res.config.installer'
-
     _columns = {
         # Human Resources Management
-        'hr_holidays':fields.boolean('Holidays / Leaves Management',
+        'hr_holidays': fields.boolean('Holidays / Leaves Management',
             help="Tracks employee leaves allocations, requests and planning."
                  "\n\nCan also plug into OpenERP's agendas and calendars "
                  "applications in order to display accepted leaves requests on"
                  " OpenERP's calendars."),
-        'hr_expense':fields.boolean('Expenses',
+        'hr_expense': fields.boolean('Expenses',
             help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
-        'hr_recruitment':fields.boolean('Recruitment Process',
+        'hr_recruitment': fields.boolean('Recruitment Process',
             help="Helps you manage and streamline your recruitment process."),
         'hr_timesheet_sheet':fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendance."),
-        'hr_contract':fields.boolean("Employee's Contracts",
+        'hr_contract': fields.boolean("Employee's Contracts",
             help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation':fields.boolean('Periodic Evaluations',
+        'hr_evaluation': fields.boolean('Periodic Evaluations',
             help="Lets you create and manage the periodic evaluation and "
                  "performance review of employees."),
-        'hr_attendance':fields.boolean('Attendances (Sign In/Out)',
+        'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
             help="Simplifies the management of employee attendances."),
         }
     _defaults = {
@@ -55,4 +54,4 @@ class hr_installer(osv.osv_memory):
 
 hr_installer()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index c79aae15dab..bc8e7ec2496 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="1">
+
     <record id="group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
+
     <record id="group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
+
 </data>
 </openerp>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 3d05e4d8f04..da1043f7b90 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -7,4 +7,3 @@
 "access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1
 "access_hr_job","hr.job","model_hr_job","hr.group_hr_user",1,0,0,0
-"access_hr_installer","hr.installer","model_hr_installer","base.group_system",1,1,1,1
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index c0db422b997..1e40f35891b 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -26,7 +26,6 @@
     'category': 'Generic Modules/Human Resources',
     'description': """
     This module aims to manage employee's attendances.
-
     Keeps account of the attendances of the employees on the basis of the
     actions(Sign in/Sign out) performed by them.
        """,
@@ -42,7 +41,7 @@
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
         'wizard/hr_attendance_sign_in_out_view.xml',
-    ],
+        ],
     'demo_xml': ['hr_attendance_demo.xml'],
     'test': ['test/test_hr_attendance.yml'],
     'installable': True,
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index e14a91df084..b8892837310 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from mx import DateTime
 import time
 
 from osv import fields, osv
@@ -29,16 +28,16 @@ class hr_action_reason(osv.osv):
     _name = "hr.action.reason"
     _description = "Action Reason"
     _columns = {
-        'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
-        'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
+        'name': fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
+        'action_type': fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
     }
     _defaults = {
-        'action_type' : lambda *a: 'sign_in',
+        'action_type': 'sign_in',
     }
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
     if ids:
         return ids[0]
     return False
@@ -51,18 +50,18 @@ class hr_attendance(osv.osv):
         res = dict.fromkeys(ids, '')
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
-
         return res
+
     _columns = {
-        'name' : fields.datetime('Date', required=True, select=1),
-        'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
-        'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
-        'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
-        'day' : fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
+        'name': fields.datetime('Date', required=True, select=1),
+        'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
+        'action_desc': fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
+        'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
-        'name' : lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'employee_id' : _employee_get,
+        'name': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'employee_id': _employee_get,
     }
 
     def _altern_si_so(self, cr, uid, ids):
@@ -75,7 +74,6 @@ class hr_attendance(osv.osv):
             and name <= (select name from hr_attendance where id=%s)
             order by name desc
             limit 2 '''
-
             cr.execute(sql,(id,id))
             atts = cr.fetchall()
             if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
@@ -113,19 +111,18 @@ class hr_employee(osv.osv):
        'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
      }
 
-    def _action_check(self, cr, uid, emp_id, dt=False,context={}):
+    def _action_check(self, cr, uid, emp_id, dt=False, context=None):
         cr.execute('select max(name) from hr_attendance where employee_id=%s', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
-    def attendance_action_change(self, cr, uid, ids, type='action', context={}, dt=False, *args):
+    def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
         id = False
         warning_sign = 'sign'
 
         #Special case when button calls this method :type=context
-        if isinstance(type,dict):
+        if isinstance(type, dict):
             type = type.get('type','action')
-
         if type == 'sign_in':
             warning_sign = "Sign In"
         elif type == 'sign_out':
@@ -135,15 +132,15 @@ class hr_employee(osv.osv):
             if not self._action_check(cr, uid, emp['id'], dt, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
 
-            res = {'action' : type, 'employee_id' : emp['id']}
+            res = {'action': type, 'employee_id': emp['id']}
 
             if dt:
                 res['name'] = dt
-
             id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
+
         return True
 
 hr_employee()
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 93908662470..372e9112269 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -7,100 +7,120 @@
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance2" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance3" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance4" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance5" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance6" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance7" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance8" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance9" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance10" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance11" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance12" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance13" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance14" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance15" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance16" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance17" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance18" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance19" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
             <field name="action">sign_in</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
         <record id="attendance20" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
             <field name="action">sign_out</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_report.xml b/addons/hr_attendance/hr_attendance_report.xml
index 329ca641377..d3e9448ead3 100644
--- a/addons/hr_attendance/hr_attendance_report.xml
+++ b/addons/hr_attendance/hr_attendance_report.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <report auto="False" id="attendance_error_report" keyword="client_print_multi" menu="False" model="hr.employee" multi="True" name="report.hr.timesheet.attendance.error" rml="hr_attendance/report/attendance_errors.rml" string="Attendance Error Report"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 68c4ad60926..08331823667 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,13 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendance">
-                    <field name="employee_id" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="action" select="1"/>
-                    <field name="action_desc" select="1"/>
+                    <field name="employee_id"  />
+                    <field name="name"  />
+                    <field name="action"  />
+                    <field name="action_desc"  />
                 </form>
             </field>
         </record>
+
         <record id="view_attendance_tree" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
@@ -51,9 +52,9 @@
                     <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <filter icon="terp-go-today" string="Today" domain="[('name::date','=',current_date)]" />
                     <separator orientation="vertical"/>
-                    <field name="employee_id" select="1" />
-                    <field name="name" select="1"  />
-                    <field name="action" select="1" />
+                    <field name="employee_id"   />
+                    <field name="name"    />
+                    <field name="action"   />
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -74,12 +75,8 @@
 
         <!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
             groups="group_hr_attendance"/>-->
-        <menuitem
-           id="menu_hr_time_tracking"
-           name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance"
-            parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
+        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -87,11 +84,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="action_type" select="1"/>
+                    <field colspan="4" name="name"  />
+                    <field name="action_type" />
                 </form>
             </field>
         </record>
+
         <record id="view_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.tree</field>
             <field name="model">hr.action.reason</field>
@@ -103,6 +101,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_attendance_reason" model="ir.actions.act_window">
             <field name="name">Attendance Reasons</field>
             <field name="type">ir.actions.act_window</field>
@@ -111,6 +110,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
+
         <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
 
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index dad6a918447..3fc43bce7c5 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -13,9 +13,7 @@
             groups="group_hr_attendance"/>-->
         <!--Time Tracking menu for Project Management-->
          <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-         <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
+         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
              parent="base.menu_main_pm" sequence="3"/>
         <!--<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
 -->
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 0c21892dc5c..2c0455e10d8 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-
 import time
 from report import report_sxw
 import pooler
 import datetime
 
 class attendance_print(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(attendance_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
@@ -80,14 +80,13 @@ class attendance_print(report_sxw.rml_parse):
                 total2 += r['delay']
         
         result_dict = {
-                'total' : total and str(total).split('.')[0],
-                'total2' : total2  and  str(total2).split('.')[0]
+                'total': total and str(total).split('.')[0],
+                'total2': total2  and str(total2).split('.')[0]
                 }
 #        return (self._sign(total),total2 and self._sign(total2))
         return [result_dict]
     
-report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print, header=2)
-
+report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header=2)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index e30d4107171..fc646e089ac 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.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/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@ from report.interface import report_rml
 from report.interface import toxml
 
 one_day = DateTime.RelativeDateTime(days=1)
-month2name = [0,'Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
+month2name = [0, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 
 def hour2str(h):
     hours = int(h)
@@ -38,11 +38,14 @@ def hour2str(h):
     return '%02dh%02d' % (hours, minutes)
 
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context):
+
+    def create_xml(self, cr, uid, ids, datas, context=None):
+        if context is None:
+            context = {}
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, 'read', [employee_id], ['name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['name'])[0]
             stop, days_xml = False, []
             user_repr = '''
             <user>
@@ -67,28 +70,27 @@ class report_custom(report_rml):
                 if attendences and attendences[0]['action'] == 'sign_out':
                     attendences.insert(0, {'name': today.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
                 if attendences and attendences[-1]['action'] == 'sign_in':
-                    attendences.append({'name' : tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+                    attendences.append({'name': tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
                 # sum up the attendances' durations
                 for att in attendences:
                     dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                     if att['action'] == 'sign_out':
                         wh += (dt - ldt).hours
                     ldt = dt
-                
+
                 # Week xml representation
                 wh = hour2str(wh)
                 today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, wh)
                 days_xml.append(today_xml)
                 today, tomor = tomor, tomor + one_day
-                
+
             user_xml.append(user_repr % '\n'.join(days_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
         </report>
         ''' % '\n'.join(user_xml)
-
         return xml
 
 report_custom('report.hr.attendance.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 9b428a6b54f..8b5bbdff5e7 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    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/>.
 #
 ##############################################################################
 
 from mx import DateTime
 from mx.DateTime import now
 
-import netsvc
+
 import pooler
 
 from report.interface import report_rml
@@ -35,20 +35,19 @@ def to_hour(h):
     return int(h), int(round((h - int(h)) * 60, 0))
 
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context):
 
+    def create_xml(self, cr, uid, ids, datas, context=None):
         start_date = DateTime.strptime(datas['form']['init_date'], '%Y-%m-%d')
         end_date = DateTime.strptime(datas['form']['end_date'], '%Y-%m-%d')
         first_monday = start_date - DateTime.RelativeDateTime(days=start_date.day_of_week)
         last_monday = end_date + DateTime.RelativeDateTime(days=7 - end_date.day_of_week)
-
         if last_monday < first_monday:
             first_monday, last_monday = last_monday, first_monday
 
         user_xml = []
 
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
             user_repr = '''
@@ -71,11 +70,11 @@ class report_custom(report_rml):
                     attendances = cr.dictfetchall()
                     week_wh = {}
                     # Fake sign ins/outs at week ends, to take attendances across week ends into account
-                    # XXX this is wrong for the first sign-in ever and the last sign out to this date 
+                    # XXX this is wrong for the first sign-in ever and the last sign out to this date
                     if attendances and attendances[0]['action'] == 'sign_out':
-                        attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
+                        attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_in'})
                     if attendances and attendances[-1]['action'] == 'sign_in':
-                        attendances.append({'name' : n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
+                        attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
                     # sum up the attendances' durations
                     for att in attendances:
                         dt = DateTime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
@@ -96,10 +95,10 @@ class report_custom(report_rml):
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr
                     week_xml.append('\n'.join(week_repr))
-                
+
                 monday, n_monday = n_monday, n_monday + one_week
             user_xml.append(user_repr % '\n'.join(week_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index 7973239ebcf..fd6ad2e0ccb 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
-    <record id="group_hr_attendance" model="res.groups">
-        <field name="name">Human Resources / Attendances User</field>
-    </record>
-</data>
+    <data noupdate="1">
+
+        <record id="group_hr_attendance" model="res.groups">
+            <field name="name">Human Resources / Attendances User</field>
+        </record>
+
+    </data>
 </openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 2b2c33cf5eb..f66e7892601 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -26,16 +27,17 @@ class hr_attendance_bymonth(osv.osv_memory):
     _name = 'hr.attendance.month'
     _description = 'Print Monthly Attendance Report'
     _columns = {
-        'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')],
-                                  'Month', required=True),
+        'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True)
                 }
     _defaults = {
-         'month': lambda * a: time.gmtime()[1],
-         'year': lambda * a: time.gmtime()[0],
+         'month': time.gmtime()[1],
+         'year': time.gmtime()[0],
              }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         datas = {
              'ids': [],
              'model': 'hr.employee',
@@ -49,4 +51,4 @@ class hr_attendance_bymonth(osv.osv_memory):
 
 hr_attendance_bymonth()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 725ce7b5004..6518202ac36 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Monthly">
 			    <group col="4" colspan="6">
-				    <field name="month"/>
-				    <field name="year"/>
-				    <newline/>
+			    <field name="month"/>
+			    <field name="year"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -42,4 +42,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 30c63d69f2b..9ef48f29fff 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -28,11 +28,11 @@ class hr_attendance_byweek(osv.osv_memory):
     _columns = {
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True)
-                }
+        }
     _defaults = {
-         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
-         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
-             }
+         'init_date': time.strftime('%Y-%m-%d'),
+         'end_date': time.strftime('%Y-%m-%d'),
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         datas = {
@@ -47,4 +47,4 @@ class hr_attendance_byweek(osv.osv_memory):
             }
 hr_attendance_byweek()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 220ceef2e48..1e536334675 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Weekly">
 			    <group col="4" colspan="6">
-			    	<separator string="Select a starting and a end date" colspan="4"/>
-				    <field name="init_date"/>
-				    <field name="end_date"/>
-				    <newline/>
+		    	<separator string="Select a starting and a end date" colspan="4"/>
+			    <field name="init_date"/>
+			    <field name="end_date"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -43,4 +43,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 47029822741..62689705c17 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -31,15 +31,16 @@ class hr_attendance_error(osv.osv_memory):
         'init_date': fields.date('Starting Date', required=True),
         'end_date': fields.date('Ending Date', required=True),
         'max_delay': fields.integer('Max. Delay (Min)', required=True)
-
-                }
+        }
     _defaults = {
-         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
-         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'init_date': time.strftime('%Y-%m-%d'),
+         'end_date': time.strftime('%Y-%m-%d'),
          'max_delay': 120,
-             }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         emp_ids = []
         data_error = self.read(cr, uid, ids)[0]
         date_from = data_error['init_date']
@@ -67,4 +68,4 @@ class hr_attendance_error(osv.osv_memory):
 
 hr_attendance_error()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 3061c263687..fbb65993f9f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
 			<form string="Print Attendance Report Error">
 			    <group col="4" colspan="6">
-			    	<separator string="Analysis Information" colspan="4"/>
-				    <field name="init_date"/>
-				    <field name="end_date"/>
-				    <field name="max_delay"/>
-				    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-				    <newline/>
+		    	<separator string="Analysis Information" colspan="4"/>
+			    <field name="init_date"/>
+			    <field name="end_date"/>
+			    <field name="max_delay"/>
+			    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+			    <newline/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
@@ -45,4 +45,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index d40829cf120..7ffd94dbca5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -20,7 +20,6 @@
 ##############################################################################
 import time
 
-import netsvc
 from osv import osv, fields
 from tools.translate import _
 
@@ -31,8 +30,11 @@ class hr_si_so_ask(osv.osv_memory):
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
         'last_time': fields.datetime('Your last sign out', required=True),
         'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
-                }
+        }
+
     def _get_empname(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
@@ -114,7 +116,7 @@ class hr_sign_in_out(osv.osv_memory):
         data = self.read(cr, uid, ids, [])[0]
         att_obj = self.pool.get('hr.attendance')
         emp_id = data['emp_id']
-        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
+        att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
         last_att = att_obj.browse(cr, uid, att_id, context=context)
         if last_att:
             last_att = last_att[0]
@@ -152,11 +154,8 @@ class hr_sign_in_out(osv.osv_memory):
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
                 raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
-            self.pool.get('hr.attendance').create(cr, uid, {
-                'name': data['last_time'],
-                'action': 'sign_out',
-                'employee_id': emp_id
-            })
+            self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
+                'employee_id': emp_id})
         try:
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index a7a39312aff..edcdf55091f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -8,10 +8,11 @@
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out">
                     <group colspan="4" >
-                        <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
-                        <field name="name" />
-                        <field name="state" />
+                    <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
+                    <field name="name" />
+                    <field name="state" />
                     </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
@@ -44,8 +45,7 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem action="action_hr_attendance_sigh_in_out"
-            id="menu_hr_attendance_sigh_in_out"
+        <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
             parent="menu_hr_time_tracking" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
@@ -55,9 +55,9 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.out.ask">
                     <group colspan="4" >
-                        <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-                        <field name="name" />
-                        <field name="last_time" string="Your last sign out" />
+                    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
+                    <field name="name" />
+                    <field name="last_time" string="Your last sign out" />
                     </group>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -74,9 +74,9 @@
             <field name="arch" type="xml">
                 <form string="hr.sign.in.out.ask">
                     <group colspan="4" >
-                        <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-                        <field name="name" />
-                        <field name="last_time" string="Your last sign in" />
+                    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
+                    <field name="name" />
+                    <field name="last_time" string="Your last sign in" />
                     </group>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -86,6 +86,5 @@
             </field>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 29678612e34..a649a53478a 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -29,7 +29,6 @@
     * Martial status,
     * Security number,
     * Place of birth, birth date, ...
-
     You can assign several contracts per employee.
     """,
     'author': 'Tiny',
@@ -40,7 +39,7 @@
         'security/hr_contract_security.xml',
         'security/ir.model.access.csv',
         'hr_contract_view.xml'
-    ],
+        ],
     'demo_xml': [],
     'test': ['test/test_hr_contract.yml'],
     'installable': True,
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 90889b6343e..edc6ee4dc74 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -34,7 +34,7 @@ class hr_employee(osv.osv):
         'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-    }
+        }
 hr_employee()
 
 #Contract wage type period name
@@ -44,10 +44,10 @@ class hr_contract_wage_type_period(osv.osv):
     _columns = {
         'name': fields.char('Period Name', size=50, required=True, select=True),
         'factor_days': fields.float('Hours in the period', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-    }
+        }
     _defaults = {
-        'factor_days': lambda *args: 168.0
-    }
+        'factor_days': 168.0
+        }
 hr_contract_wage_type_period()
 
 #Contract wage type (hourly, daily, monthly, ...)
@@ -55,15 +55,15 @@ class hr_contract_wage_type(osv.osv):
     _name = 'hr.contract.wage.type'
     _description = 'Wage Type'
     _columns = {
-        'name' : fields.char('Wage Type Name', size=50, required=True, select=True),
-        'period_id' : fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
-        'type' : fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
+        'name': fields.char('Wage Type Name', size=50, required=True, select=True),
+        'period_id': fields.many2one('hr.contract.wage.type.period', 'Wage Period', required=True),
+        'type': fields.selection([('gross','Gross'), ('net','Net')], 'Type', required=True),
         'factor_type': fields.float('Factor for hour cost', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
-    }
+        }
     _defaults = {
-        'type' : lambda *a : 'gross',
-        'factor_type': lambda *args: 1.8
-    }
+        'type': 'gross',
+        'factor_type': 1.8
+        }
 hr_contract_wage_type()
 
 
@@ -93,10 +93,11 @@ class hr_contract(osv.osv):
         'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
         'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
         'notes': fields.text('Notes'),
-    }
+        }
     _defaults = {
-        'date_start' : lambda *a : time.strftime("%Y-%m-%d"),
-    }
+        'date_start': time.strftime("%Y-%m-%d"),
+        }
+
 hr_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
index 511bbce3f4e..de77e8e4277 100644
--- a/addons/hr_contract/hr_contract_data.xml
+++ b/addons/hr_contract/hr_contract_data.xml
@@ -19,6 +19,7 @@
             <field name="type">gross</field>
             <field name="period_id" ref="hr_contract_wage_type_period_monthly"/>
         </record>
+
         <record id="hr_contract_monthly_net" model="hr.contract.wage.type">
             <field name="name">Monthly Net Wage</field>
             <field name="type">net</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e1135a9f058..5ff928916c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
-            <field name="name">hr.contract.wage.type.period.view.form</field>
-            <field name="model">hr.contract.wage.type.period</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wage Period">
-                    <field colspan="4" name="name"/>
-                    <field name="factor_days"/>
-                </form>
-            </field>
-        </record>
-
         <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.view.form</field>
             <field name="model">hr.contract.wage.type</field>
@@ -37,31 +25,76 @@
                 <tree string="Wage Types">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="period_id" invisible="1"/>
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_wage_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.view.search</field>
+            <field name="model">hr.contract.wage.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Type">
+                   <group col='15' colspan='4'>
+                   <field name="name"/>
+                   <field name="type"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                   <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type" model="ir.actions.act_window">
             <field name="name">Contract Wage Type</field>
             <field name="res_model">hr.contract.wage.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
-
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
+        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.form</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wage Period">
+                    <field colspan="4" name="name"/>
+                    <field name="factor_days"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="hr_contract_wage_type_period_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.search</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Period">
+                   <group col='15' colspan='4'>
+                    <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
             <field name="name">Wage period</field>
             <field name="res_model">hr.contract.wage.type.period</field>
             <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_period_view_search"/>
         </record>
-        <menuitem
-                action="action_hr_contract_wage_type_period"
-                id="hr_menu_contract_wage_type_period"
-                parent="hr_contract.next_id_56"/>
 
+        <menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period"
+                parent="hr_contract.next_id_56"/>
 
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -71,20 +104,20 @@
                 <notebook position="inside">
                     <page string="Miscelleanous">
                         <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
+                        <separator string="Personal Info" colspan="2"/>
+                        <field name="bank_account"/>
+                        <field name="place_of_birth"/>
+                        <field name="children"/>
                         </group>
                         <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" select="1"/>
-                            <field name="vehicle" select="1"/>
-                            <field name="vehicle_distance" select="1"/>
+                        <separator string="Job Info" colspan="2"/>
+                        <field name="manager" />
+                        <field name="vehicle" />
+                        <field name="vehicle_distance" />
                         </group>
                         <group colspan="2" col="2">
-                            <separator string="Others Info" colspan="2"/>
-                            <field name="medic_exam" select="1"/>
+                        <separator string="Others Info" colspan="2"/>
+                        <field name="medic_exam" />
                         </group>
                     </page>
                 </notebook>
@@ -98,14 +131,14 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                       <field name="name"/>
-                       <field name="employee_id"/>
-                       <field name="date_start"/>
-                       <field name="date_end"/>
+                   <field name="name"/>
+                   <field name="employee_id"/>
+                   <field name="date_start"/>
+                   <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                       <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                    <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
                    </group>
                </search>
             </field>
@@ -118,26 +151,26 @@
             <field name="arch" type="xml">
                 <form string="Contract">
                     <group colspan="3" col="6">
-                        <field name="name" select="1"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="job_id"/>
-                        <field name="wage"/>
-                        <field name="wage_type_id" widget="selection"/>
-                        <field name="type_id" widget="selection"/>
+                    <field name="name" />
+                    <field name="employee_id" />
+                    <field name="job_id"/>
+                    <field name="wage"/>
+                    <field name="wage_type_id" widget="selection"/>
+                    <field name="type_id" widget="selection"/>
                     </group>
                     <notebook>
                     <page string="Main Data">
                         <group col="2" colspan="2">
-                            <separator colspan="2" string="Duration"/>
-                            <field name="date_start" select="1"/>
-                            <field name="date_end" select="1"/>
-                            <field name="working_hours"/>
+                        <separator colspan="2" string="Duration"/>
+                        <field name="date_start" />
+                        <field name="date_end" />
+                        <field name="working_hours"/>
                         </group>
                         <group col="2" colspan="2">
-                            <separator colspan="2" string="Advantages"/>
-                            <field name="advantages_net"/>
-                            <field name="advantages_gross"/>
-                            <field name="advantages" nolabel="1" colspan="2"/>
+                        <separator colspan="2" string="Advantages"/>
+                        <field name="advantages_net"/>
+                        <field name="advantages_gross"/>
+                        <field name="advantages" nolabel="1" colspan="2"/>
                         </group>
                         <separator colspan="4" string="Notes"/>
                         <field colspan="4" name="notes" nolabel="1"/>
@@ -181,7 +214,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract Type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                 </form>
             </field>
         </record>
@@ -196,19 +229,33 @@
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.search</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Contract Type">
+                   <group col='15' colspan='4'>
+                    <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_type" model="ir.actions.act_window">
             <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
 
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index b8fbf3b54ea..f407166082c 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
-    <record id="group_hr_contract" model="res.groups">
-        <field name="name">Human Resources / Contracts</field>
-    </record>
+        <record id="group_hr_contract" model="res.groups">
+            <field name="name">Human Resources / Contracts</field>
+        </record>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 84d4ea61b57..9292b10fd4c 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -21,27 +21,29 @@
 
 {
     "name" : "Human Resources Evaluation",
-    "version" : "0.1",
-    "author" : "Tiny",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
-    "depends" : ["hr",'hr_recruitment','survey'],
+    "version": "0.1",
+    "author": "Tiny",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
+    "depends": ["hr",'hr_recruitment','survey'],
     "description": """
-                      Ability to create employees evaluation.
-                      An evaluation can be created by employee for subordinates,
-                      juniors as well as his manager.The evaluation is done under a plan
-                      in which various surveys can be created and it can be defined which
-                      level of employee hierarchy fills what and final review and evaluation
-                      is done by the manager.Every evaluation filled by the employees can be viewed
-                      in the form of.Implements a dashboard for My Current Evaluations   """,
-    "init_xml" : [],
-    "demo_xml" : ["hr_evaluation_demo.xml",
+          Ability to create employees evaluation.
+          An evaluation can be created by employee for subordinates,
+          juniors as well as his manager.The evaluation is done under a plan
+          in which various surveys can be created and it can be defined which
+          level of employee hierarchy fills what and final review and evaluation
+          is done by the manager.Every evaluation filled by the employees can be viewed
+          in the form of.Implements a dashboard for My Current Evaluations  
+         """,
+    "init_xml": [],
+    "demo_xml": ["hr_evaluation_demo.xml",
                  ],
-    "update_xml" : [
-                    "security/ir.model.access.csv",
-                    "wizard/hr_evaluation_mail_view.xml",
-                    "hr_evaluation_view.xml",
-                    "report/hr_evaluation_report_view.xml"],
+    "update_xml": [
+        "security/ir.model.access.csv",
+        "wizard/hr_evaluation_mail_view.xml",
+        "hr_evaluation_view.xml",
+        "report/hr_evaluation_report_view.xml"
+        ],
     "test": ["test/test_hr_evaluation.yml"],
     "active": False,
     "installable": True
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c13a8ab63c..429b492131d 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -36,10 +36,11 @@ class hr_evaluation_plan(osv.osv):
         'month_first': fields.integer('First Evaluation After'),
         'month_next': fields.integer('Next Evaluation After'),
         'active': fields.boolean('Active')
-    }
+        }
     _defaults = {
-        'active' : lambda *a: True,
-    }
+        'active': True,
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+        }
 hr_evaluation_plan()
 
 class hr_evaluation_plan_phase(osv.osv):
@@ -74,8 +75,8 @@ class hr_evaluation_plan_phase(osv.osv):
         'email_subject':fields.text('char')
     }
     _defaults = {
-        'sequence' : lambda *a: 1,
-        'email_subject':_('''Regarding '''),
+        'sequence' : 1,
+        'email_subject': _('''Regarding '''),
         'mail_body' : lambda *a:_('''
 Date : %(date)s
 
@@ -92,8 +93,6 @@ Thanks,
 
         '''),
     }
-
-
 hr_evaluation_plan_phase()
 
 class hr_employee(osv.osv):
@@ -105,6 +104,8 @@ class hr_employee(osv.osv):
     }
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+        if context is None:
+            context = {}
         for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context):
             if id.evaluation_plan_id and id.evaluation_date:
                 if (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
@@ -112,7 +113,7 @@ class hr_employee(osv.osv):
                     self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : id.id, 'plan_id': id.evaluation_plan_id}, context)
         return True
 
-    def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context={}):
+    def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
         evaluation_date = evaluation_date or False
         evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
         if evaluation_plan_id:
@@ -126,10 +127,10 @@ class hr_employee(osv.osv):
                     evaluation_date=(dt.ISO.ParseAny(evaluation_date)+ dt.RelativeDateTime(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
                     flag = True
             if ids and flag:
-                self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : ids[0], 'plan_id': evaluation_plan_id}, context=context)
-        return {'value': {'evaluation_date':evaluation_date}}
+                self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
+        return {'value': {'evaluation_date': evaluation_date}}
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         id = super(hr_employee, self).create(cr, uid, vals, context=context)
         if vals.get('evaluation_plan_id', False):
             self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id' : id, 'plan_id': vals['evaluation_plan_id']}, context=context)
@@ -172,7 +173,17 @@ class hr_evaluation(osv.osv):
         'state' : lambda *a: 'draft',
     }
 
-    def onchange_employee_id(self, cr, uid, ids, employee_id, context={}):
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        reads = self.browse(cr, uid, ids, context)
+        res = []
+        for record in reads:
+            name = record.plan_id.name
+            res.append((record['id'], name))
+        return res
+
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         employee_obj=self.pool.get('hr.employee')
         evaluation_plan_id=''
         if employee_id:
@@ -182,7 +193,7 @@ class hr_evaluation(osv.osv):
                 employee_ids=employee_obj.search(cr, uid, [('parent_id','=',employee.id)], context=context)
         return {'value': {'plan_id':evaluation_plan_id}}
 
-    def button_plan_in_progress(self, cr, uid, ids, context={}):
+    def button_plan_in_progress(self, cr, uid, ids, context=None):
         apprai_id = []
         for evaluation in self.browse(cr, uid, ids, context):
             wait = False
@@ -213,13 +224,8 @@ class hr_evaluation(osv.osv):
                         hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [int_id], context=context)
 
                     if (not wait) and phase.mail_feature:
-                        body = phase.mail_body % {
-                            'employee_name': child.name,
-                            'user_signature': user.signature,
-                            'eval_name': phase.survey_id.title,
-                            'date': time.strftime('%Y-%m-%d'),
-                            'time': time
-                        }
+                        body = phase.mail_body % {'employee_name': child.name, 'user_signature': user.signature,
+                            'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
                         dest = [child.work_email]
                         if dest:
@@ -228,7 +234,7 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
 
-    def button_final_validation(self, cr, uid, ids, context={}):
+    def button_final_validation(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'progress'})
         request_obj = self.pool.get('hr.evaluation.interview')
         for id in self.browse(cr, uid ,ids,context=context):
@@ -236,49 +242,55 @@ class hr_evaluation(osv.osv):
                 raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state"))
         return True
 
-    def button_done(self,cr, uid, ids, context={}):
+    def button_done(self,cr, uid, ids, context=None):
         self.write(cr,uid,ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
-    def button_cancel(self, cr, uid, ids, context={}):
+    def button_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
 
 hr_evaluation()
 
 class survey_request(osv.osv):
-    _inherit="survey.request"
+    _inherit = "survey.request"
     _columns = {
-        'is_evaluation':fields.boolean('Is Evaluation?'),
-    }
+        'is_evaluation': fields.boolean('Is Evaluation?'),
+        }
+    _defaults = {
+        'state': 'waiting_answer',
+        }
 
 survey_request()
 
 class hr_evaluation_interview(osv.osv):
-    _name='hr.evaluation.interview'
-    _inherits={'survey.request':'request_id'}
-    _description='Evaluation Interview'
+    _name = 'hr.evaluation.interview'
+    _inherits = {'survey.request': 'request_id'}
+    _description = 'Evaluation Interview'
     _columns = {
         'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade'),
         'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
-        'evaluation_id' : fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
-    }
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
+        }
     _defaults = {
-        'is_evaluation': lambda *a: True,
-    }
+        'is_evaluation': True,
+        }
 
-    def survey_req_waiting_answer(self, cr, uid, ids, context={}):
+    def survey_req_waiting_answer(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
         return True
 
-    def survey_req_done(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state' : 'done'})
+    def survey_req_done(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
-        for id in self.browse(cr, uid, ids,context=context):
+        for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
             tot_done_req = 0
-            records = self.pool.get("hr_evaluation.evaluation").browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
+            if not id.evaluation_id.id:
+                raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
+            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
             for child in records:
                 if child.state == "draft" :
                     wating_id = child.id
@@ -289,15 +301,16 @@ class hr_evaluation_interview(osv.osv):
                     tot_done_req += 1
             if not flag and wating_id:
                 self.survey_req_waiting_answer(cr, uid, [wating_id], context)
-            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress' :tot_done_req * 100 / len(records)}, context=context)
-
-        return True
-    def survey_req_draft(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state' : 'draft'}, context=context)
+            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress': tot_done_req * 100 / len(records)}, context=context)
+        self.write(cr, uid, ids, { 'state': 'done'})
         return True
 
-    def survey_req_cancel(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state' : 'cancel'}, context=context)
+    def survey_req_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'state': 'draft'}, context=context)
+        return True
+
+    def survey_req_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'state': 'cancel'}, context=context)
         return True
 
     def action_print_survey(self, cr, uid, ids, context=None):
@@ -313,12 +326,12 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
-
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
-        context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
+        context.update({'survey_id': record.survey_id.id, 'response_id': [record.response.id], 'response_no':0,})
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
         return value
+
 hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 83776dde4cd..1147483f8fd 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="survey_2" model="survey">
             <field name="title">Employee Evaluation</field>
             <field name="max_response_limit">20</field>
@@ -10,6 +11,7 @@
             <field name="response_user">5</field>
         </record>
     </data>
+
     <data>
         <record id="survey_3" model="survey">
             <field name="title">Employee Opinion</field>
@@ -20,6 +22,7 @@
             <field name="response_user">5</field>
         </record>
     </data>
+
     <data>
         <record id="survey_page_1" model="survey.page">
             <field name="title">Employee Evaluation Form</field>
@@ -27,6 +30,7 @@
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_page_2" model="survey.page">
             <field name="title">Process</field>
@@ -42,6 +46,7 @@
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_page_6" model="survey.page">
             <field name="title">Employee Performance In Key Areas</field>
@@ -81,8 +86,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_0" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -132,6 +135,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_3" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -156,6 +160,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_4" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -203,6 +208,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <!--record id="survey_question_7" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -227,6 +233,7 @@
             <field eval="0" name="allow_comment"/>
         </record-->
     </data>
+
     <data>
         <record id="survey_question_8" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -304,8 +311,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_14" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -331,7 +336,6 @@
         </record>
     </data>
 
-
     <data>
         <record id="survey_question_17" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -356,6 +360,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_18" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -381,8 +386,6 @@
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_question_23" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -436,6 +439,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_40" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -460,6 +464,7 @@
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_41" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -502,7 +507,6 @@
             <field name="type">descriptive_text</field>
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field name="descriptive_text">* It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated.
-
 * Critical or key elements of performance and professional development needs (if any), should also be noted at this time</field>
             <field eval="0" name="make_comment_field"/>
             <field eval="1" name="in_visible_menu_choice"/>
@@ -583,7 +587,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
     <!--data>
         <record id="survey_question_42" model="survey.question">
             <field name="in_visible_answer_type">1</field>
@@ -727,6 +730,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="allow_comment"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_4" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -735,6 +739,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_5" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -743,6 +748,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_6" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -751,6 +757,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_7" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -759,6 +766,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_8" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -767,6 +775,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_4"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_9" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -775,6 +784,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_10" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -783,6 +793,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_11" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -791,6 +802,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_12" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -799,6 +811,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_13" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -807,6 +820,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_8"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_14" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -815,6 +829,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_15" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -823,6 +838,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_16" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -831,6 +847,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_17" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -839,6 +856,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_18" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -847,6 +865,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_3"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_19" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -855,6 +874,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_20" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -863,6 +883,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_21" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -871,6 +892,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_22" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -879,6 +901,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_23" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -887,6 +910,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_6"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_24" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -895,6 +919,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_25" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -903,6 +928,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_26" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -911,6 +937,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_27" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -919,6 +946,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_28" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -927,6 +955,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_10"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_29" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -935,6 +964,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_30" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -943,6 +973,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_31" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -951,6 +982,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_32" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -959,6 +991,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_33" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -967,6 +1000,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_14"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_34" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -975,6 +1009,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_35" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -983,6 +1018,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_36" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -991,6 +1027,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_37" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -999,6 +1036,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_38" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1007,6 +1045,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_18"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_39" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1015,6 +1054,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_40" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1023,6 +1063,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_41" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1031,6 +1072,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_42" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1039,6 +1081,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_40"/>
         </record>
     </data>
+
     <data>
         <record id="survey_question_column_heading_43" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1056,6 +1099,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_1" model="survey.answer">
             <field name="answer">Name</field>
@@ -1064,6 +1108,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_2" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1072,6 +1117,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_3" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1080,6 +1126,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_4" model="survey.answer">
             <field name="in_visible_answer_type">0</field>
@@ -1089,6 +1136,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_5" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1097,6 +1145,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_6" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1105,6 +1154,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_7" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1113,6 +1163,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_8" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1121,6 +1172,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_9" model="survey.answer">
             <field name="in_visible_answer_type">0</field>
@@ -1130,6 +1182,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_10" model="survey.answer">
             <field name="answer">Position Title</field>
@@ -1138,6 +1191,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_11" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1146,6 +1200,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_12" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1154,6 +1209,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_13" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1162,6 +1218,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_14" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1170,6 +1227,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_15" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1178,6 +1236,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="2" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_16" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1187,6 +1246,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_17" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1195,6 +1255,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_18" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1203,6 +1264,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_19" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1211,6 +1273,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_20" model="survey.answer">
             <field name="answer">Appraisal for Period</field>
@@ -1219,6 +1282,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_21" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1227,6 +1291,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_22" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1235,6 +1300,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_23" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1243,6 +1309,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_24" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1251,6 +1318,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_25" model="survey.answer">
             <field name="answer">Date of Review</field>
@@ -1259,6 +1327,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="4" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_26" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1267,6 +1336,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_27" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1276,8 +1346,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
-
     <data>
         <record id="survey_answer_31" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1287,7 +1355,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
     <data>
         <record id="survey_answer_43" model="survey.answer">
             <field name="answer">Appraiser</field>
@@ -1296,6 +1363,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_44" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1304,6 +1372,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_45" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1312,6 +1381,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_46" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1320,6 +1390,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_47" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1328,6 +1399,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_48" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1336,6 +1408,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_49" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1344,6 +1417,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_50" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1352,6 +1426,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_51" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1360,6 +1435,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_52" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1377,6 +1453,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_68" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1385,6 +1462,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_69" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1393,6 +1471,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_70" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1401,6 +1480,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_71" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1409,6 +1489,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_72" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1417,6 +1498,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_73" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1425,6 +1507,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_74" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1433,6 +1516,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_75" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1441,6 +1525,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_76" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1449,6 +1534,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_77" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1457,6 +1543,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="5" name="sequence"/>
         </record>
     </data>
+
     <data>
         <record id="survey_answer_78" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
@@ -1483,6 +1570,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_9"/>
         </record>
     </data>
+
     <data>
         <record id="survey_tbl_column_heading_results0" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1491,6 +1579,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question_id" ref="survey_question_9"/>
         </record>
     </data>
+
     <data>
         <record id="survey_tbl_column_heading_comments0" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1500,7 +1589,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
 <!--    <data noupdate="1">-->
 <!--        <record id="survey_request_1" model="survey.request">-->
 <!--            <field name="state">waiting_answer</field>-->
@@ -1510,6 +1598,7 @@ Once the form had been filled, the employee send it to his supervisor.
 <!--            <field name="date_deadline">2010-02-21</field>-->
 <!--        </record>-->
 <!--    </data>-->
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
@@ -1519,6 +1608,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="company_id" ref="base.main_company"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1534,6 +1624,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1549,6 +1640,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1564,6 +1656,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="wait"/>
         </record>
     </data>
+
     <data noupdate="1">
         <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
@@ -1603,8 +1696,7 @@ Once the form had been filled, the employee send it to his supervisor.
 <!--    </data>-->
 
 		<data>
-		  <record forcecreate="True" id="ir_cron_scheduler_evaluation"
-		   model="ir.cron">
+		  <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
 		   <field name="name">Run Employee Evaluation</field>
 		   <field eval="True" name="active" />
 		   <field name="user_id" ref="base.user_root" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5784bb4d868..32e93d5964b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -61,13 +61,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
-       <menuitem
-            name="Periodic Evaluations" 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"
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
+        <menuitem name="Periodic Evaluations" 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"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
@@ -79,7 +76,7 @@
                  <notebook>
                    <page string="General">
                     <field name="plan_id" invisible="1"/>
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="wait"/>
                         <field name="sequence"/>
@@ -185,30 +182,19 @@
                     <newline/>
                     <group col="6" colspan="4">
                     <field name="state"/>
-                    <button name="button_plan_in_progress"
-                            string="Start Evaluation"
-                            states="draft"
-                            type="object"
+                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_final_validation"
-                            string="Final Validation"
-                            states="wait"
-                            type="object"
+                    <button name="button_final_validation" string="Final Validation" states="wait" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_done"
-                            string="Done"
-                            states="progress"
-                            type="object"
+                    <button name="button_done" string="Done" states="progress" type="object"
                             icon="gtk-jump-to"/>
-                    <button name="button_cancel"
-                            string="Cancel"
-                            states="draft,wait,progress"
-                            type="object"
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                             icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_tree">
             <field name="name">hr_evaluation.evaluation.tree</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -225,6 +211,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_graph">
             <field name="name">hr_evaluation.evaluation.graph</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -236,6 +223,7 @@
                 </graph>
             </field>
         </record>
+
        <record id="hr_evaluation.evaluation_search" model="ir.ui.view">
             <field name="name">hr_evaluation.evaluation_search</field>
             <field name="model">hr_evaluation.evaluation</field>
@@ -243,22 +231,17 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
-                        <filter icon="terp-dialog-close" string="Final Step" domain="[('state','=','progress')]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            help="Evaluations to close within the next 7 days"
-                            domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-dialog-close" string="Final Step" domain="[('state','=','progress')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
+                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed"
-                            help="Evaluations that overpassed the deadline"
-                            domain="[('date','&gt;=',(datetime.date.today()))]"
-                        />
-
+                            help="Evaluations that overpassed the deadline" domain="[('date','&gt;=',(datetime.date.today()))]" />
                         <separator orientation="vertical"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="plan_id" widget="selection" select="1"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                         </group>
                         <newline/>
                         <group expand='0' string='Group by...'>
@@ -278,9 +261,8 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
         </record>
-        <menuitem
-            name="Evaluation" parent="menu_eval_hr"
-            id="menu_open_view_hr_evaluation_tree"
+
+        <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
@@ -290,15 +272,12 @@
             <field name="arch" type="xml">
                 <form string="Interview Evaluation">
                     <group col="4" colspan="4">
-                        <field name="survey_id"  colspan="3"/>
-                        <group  colspan="1">
-                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
-                                icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                                icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                        <field name="survey_id"/>
+                        <field name="evaluation_id"/>
+                        <group col="2" colspan="2">
+                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
-                    </group>
-                    <group col="4" colspan="4">
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
@@ -328,10 +307,8 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
-                        icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                        icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
                     <field name="state"/>
                 </tree>
             </field>
@@ -346,12 +323,17 @@
                    <group col='10' colspan='4'>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Survey" icon="terp-personal" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -365,17 +347,13 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
-        <menuitem
-            name="Interview Requests" parent="menu_eval_hr"
-            id="menu_open_hr_evaluation_interview_requests"
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-
-      <menuitem name="Evaluation Reminders" parent="menu_eval_hr"
-           id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail"
-           sequence="45"/>
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
+           action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
new file mode 100644
index 00000000000..87a362033f9
--- /dev/null
+++ b/addons/hr_evaluation/i18n/es.po
@@ -0,0 +1,279 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-06-29 22:34+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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: 2010-07-01 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "Información"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+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 puede contener ningún "
+"carácter especial!"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "Programar siguiente evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr "Puntos malos"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr "Mi siguiente evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr "Valores"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr "Puntos buenos"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Puntuación"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr "Datos informales"
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo inválido en la definición de acción."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "Empleado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr "A mejorar"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Evaluación"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr "Tipo de evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr "Aplicar a categorias"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr "Capacidad de crear evaluaciones de empleados"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr "Cita"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr "Usuario evaluación"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr "Resultados elecciones"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr "Evaluaciones"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr "Siguientes evaluaciones"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la estructura de la vista!"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr "Criterios de evaluación"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr "Mis evaluaciones previas"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr "Responsable RRHH"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr "Resúmen"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr "Evaluación empleado"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr "Tipo evaluación empleado"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr "Citas"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr "Siguiente evaluación empleado"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_evaluation/report/__init__.py b/addons/hr_evaluation/report/__init__.py
index 507f8d6715b..f8ddaab3486 100644
--- a/addons/hr_evaluation/report/__init__.py
+++ b/addons/hr_evaluation/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import hr_evaluation_report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 7c97ff5055e..56af08e4598 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import tools
 from osv import fields,osv
 
@@ -75,9 +76,9 @@ class hr_evaluation_report(osv.osv):
                      s.state
                      from
                  hr_evaluation_interview l
-                 left join
+                LEFT JOIN
                      hr_evaluation_evaluation s on (s.id=l.evaluation_id)
-                 group by
+                 GROUP BY
                      s.create_date,
                      date_trunc('day',s.create_date),
                      to_char(s.create_date, 'YYYY-MM-DD'),
@@ -92,5 +93,8 @@ class hr_evaluation_report(osv.osv):
                      s.plan_id
             )
         """)
+
 hr_evaluation_report()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2a5cbe21ad9..a0f46170518 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
+
     <record id="view_evaluation_report_tree" model="ir.ui.view">
         <field name="name">hr.evaluation.report.tree</field>
         <field name="model">hr.evaluation.report</field>
@@ -43,33 +44,18 @@
             <search string="Evaluations Analysis">
             	<group>
             		<filter icon="terp-go-year" string="365 Days"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                    	help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="30 Days"
-                    	name="month"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                    	help="Tasks performed in last 30 days"/>
-	                <filter icon="terp-go-week"
-                        string="    7 Days    "
-                        separator="1"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks during last 7 days"/>
+                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date', '&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 365 days"/>
+                    <filter icon="terp-go-month" string="30 Days" name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Tasks performed in last 30 days"/>
+	                <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
-                    <filter string="Draft"
-                    	icon="terp-document-new"
-                    	domain="[('state','=','draft')]"
+                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]"
                     	help = "Draft Evaluations"/>
-	                <filter string="Plan In Progress"
-	                	icon="terp-camera_test"
-	                	domain="[('state', '=' ,'wait')]"
+	                <filter string="Plan In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
-                   	<filter string="Final Validation"
-                   		icon="terp-check"
-                   		domain="[('state','=','progress')]"
+                   	<filter string="Final Validation" icon="terp-check" domain="[('state','=','progress')]"
                    		help = "Final Validation Evaluations"/>
-                   	<filter icon="terp-dialog-close"
-                        string="Done"
-                        domain="[('state','=','done')]"/>
+                   	<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
 	                <field name="employee_id" widget="selection"/>
 	                <field name="plan_id" widget="selection"/>
@@ -86,13 +72,13 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
-                 <newline/>
+                <newline/>
 				<group expand="0" string="Extended options..." groups="base.group_extended">
-                    <field name="rating"/>
-                    <separator orientation="vertical"/>
-                    <field name="deadline"/>
-                    <separator orientation="vertical"/>
-                    <field name="state"/>
+                <field name="rating"/>
+                <separator orientation="vertical"/>
+                <field name="deadline"/>
+                <separator orientation="vertical"/>
+                <field name="state"/>
                 </group>
             </search>
         </field>
@@ -110,5 +96,5 @@
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/>
 
-</data>
+    </data>
 </openerp>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 50656820e99..7f6355a3c06 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -6,4 +6,3 @@
 "access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1
 "access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","hr.group_hr_manager",1,0,0,0
-"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 367cabbe90b..1a855087bbc 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -21,5 +21,4 @@
 
 import hr_evaluation_mail
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 42b0654de1b..97dd1ca01c7 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -28,7 +28,7 @@ class hr_evaluation_reminder(osv.osv_memory):
         'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluations', required=True)
     }
 
-    def send_mail(self, cr, uid, ids, context={}):
+    def send_mail(self, cr, uid, ids, context=None):
         hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
         for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
@@ -40,4 +40,4 @@ class hr_evaluation_reminder(osv.osv_memory):
 
 hr_evaluation_reminder()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 3769efcdfa8..9319b8d88fd 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-
     <data>
-    	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
-            <field name="name">hr.evaluation.send.mail</field>
-            <field name="model">hr.evaluation.reminder</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             	<form string="Evaluation Reminders">
-			    	<field name="evaluation_id"/>
-			    	<newline/>
-			    	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-              		<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
-             	</form>
-            </field>
-		</record>
+
+	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
+        <field name="name">hr.evaluation.send.mail</field>
+        <field name="model">hr.evaluation.reminder</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+			<form string="Evaluation Reminders">
+				<group width="340">
+				<separator string="Send evaluation reminder" colspan="4"/>
+				<field name="evaluation_id"/>
+				<separator colspan="4"/>
+					<group colspan="4">
+						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+						<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+					</group>
+				</group>
+         	</form>
+        </field>
+	</record>
 
     <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
-            <field name="name">Evaluation Send Mail</field>
-            <field name="res_model">hr.evaluation.reminder</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_hr_evaluation_send_mail"/>
-           <field name="context">{'record_id':active_id}</field>
-           <field name="target">new</field>
-      </record>
+        <field name="name">Evaluation Send Mail</field>
+        <field name="res_model">hr.evaluation.reminder</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_hr_evaluation_send_mail"/>
+        <field name="context">{'record_id':active_id}</field>
+        <field name="target">new</field>
+    </record>
 
      </data>
 </openerp>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index dda5cd0f8a3..3be26d8ff72 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -51,10 +51,11 @@
         'process/hr_expense_process.xml',
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
-    ],
-    'demo_xml': ['hr_expense_demo.xml',
-#                'hr.expense.expense.csv'
-                ],
+        ],
+    'demo_xml': [
+        'hr_expense_demo.xml',
+#       'hr.expense.expense.csv'
+        ],
     'test': ['test/test_hr_expense.yml'],            
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 797e258cb31..cc5488a8f2e 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="action_my_expense" model="ir.actions.act_window">
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
@@ -20,5 +21,6 @@
 			</xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d32a136e0d2..d1d151c08f3 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -25,7 +25,7 @@ from osv import fields, osv
 from tools.translate import _
 
 def _employee_get(obj, cr, uid, context=None):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
     if ids:
         return ids[0]
     return False
@@ -34,15 +34,15 @@ class hr_expense_expense(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
-        default.update( {'invoice_id':False,'date_confirm':False,'date_valid':False,'user_valid':False})
+        default.update({'invoice_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
 
-    def _amount(self, cr, uid, ids, field_name, arg, context):
-        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ",(tuple(ids),))
+    def _amount(self, cr, uid, ids, field_name, arg, context=None):
+        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ", (tuple(ids),))
         res = dict(cr.fetchall())
         return res
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, [uid])[0]
         if user.company_id:
             return user.company_id.currency_id.id
@@ -158,18 +158,17 @@ class hr_expense_expense(osv.osv):
                 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
             }
             if payment_term_id:
-                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [],
-                        payment_term_id, None)
+                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
                 if to_update:
                     inv.update(to_update['value'])
             if exp.journal_id:
                 inv['journal_id']=exp.journal_id.id
-            inv_id = invoice_obj.create(cr, uid, inv, {'type':'in_invoice'})
-            invoice_obj.button_compute(cr, uid, [inv_id], {'type':'in_invoice'},
-                    set_total=True)
+            inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
+            invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
             self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             res = inv_id
         return res
+
 hr_expense_expense()
 
 class product_product(osv.osv):
@@ -184,7 +183,7 @@ class hr_expense_line(osv.osv):
     _name = "hr.expense.line"
     _description = "Expense Line"
 
-    def _amount(self, cr, uid, ids, field_name, arg, context):
+    def _amount(self, cr, uid, ids, field_name, arg, context=None):
         if not len(ids):
             return {}
         cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_line l WHERE id IN %s GROUP BY l.id ",(tuple(ids),))
@@ -204,11 +203,11 @@ class hr_expense_line(osv.osv):
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of expense lines."),
-    }
+        }
     _defaults = {
-        'unit_quantity': lambda *a: 1,
-        'date_value' : lambda *a: time.strftime('%Y-%m-%d'),
-    }
+        'unit_quantity': 1,
+        'date_value': time.strftime('%Y-%m-%d'),
+        }
     _order = "sequence"
 
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
@@ -218,13 +217,11 @@ class hr_expense_line(osv.osv):
         if product_id:
             product=self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v['name']=product.name
-
             # Compute based on pricetype of employee company
             pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.property_valuation_price_type.id
             context['currency_id']=self.pool.get('hr.employee').browse(cr, uid, employee_id).user_id.company_id.currency_id.id
             pricetype=self.pool.get('product.price.type').browse(cr, uid, pricetype_id)
             amount_unit=product.price_get(pricetype.field, context)[product.id]
-
             v['unit_amount']=amount_unit
             if not uom_id:
                 v['uom_id']=product.uom_id.id
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 148ab026a0f..da348b02ab4 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -58,6 +58,7 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
+
 		<record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
 			<field name="name">Basic PC - Server for Seagate</field>
 			<field name="date_value">2010-05-03</field>
@@ -68,7 +69,9 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
+
 	</data>
+
 	<data noupdate="1">
 		<record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
 			<field name="currency_id" ref="base.EUR"/>
@@ -79,6 +82,7 @@
 			<field name="date">2010-04-20</field>
 			<field name="state">draft</field>
 		</record>
+
 		<record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
 			<field name="name">Hotel Expenses - Thymbra</field>
 			<field name="date_value">2010-05-03</field>
@@ -89,17 +93,17 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="5.0" name="unit_quantity"/>
 		</record>
-                <record id="hr_expense_line_car_travel" model="hr.expense.line">
-                        <field name="name">Bruxelles - Paris</field>
-                        <field name="date_value">2010-05-03</field>
-                        <field name="analytic_account" ref="account.analytic_thymbra"/>
-                        <field name="product_id" ref="product_product_expense_car"/>
-                        <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
-                        <field eval="0.30" name="unit_amount"/>
-                        <field name="uom_id" ref="product.product_uom_km"/>
-                        <field eval="622.0" name="unit_quantity"/>
-                </record>
 
+        <record id="hr_expense_line_car_travel" model="hr.expense.line">
+                <field name="name">Bruxelles - Paris</field>
+                <field name="date_value">2010-05-03</field>
+                <field name="analytic_account" ref="account.analytic_thymbra"/>
+                <field name="product_id" ref="product_product_expense_car"/>
+                <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+                <field eval="0.30" name="unit_amount"/>
+                <field name="uom_id" ref="product.product_uom_km"/>
+                <field eval="622.0" name="unit_quantity"/>
+        </record>
 
 	</data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index 9d5f0c3e2c1..5defbfec330 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="HR expenses"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml
index 4350faecb47..e7de7eb1350 100644
--- a/addons/hr_expense/hr_expense_sequence.xml
+++ b/addons/hr_expense/hr_expense_sequence.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <record id="seq_type_hr_expense_invoice" model="ir.sequence.type">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
         </record>
+
         <record id="seq_hr_expense_invoice" model="ir.sequence">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
             <field name="prefix">EXP/</field>
             <field name="padding">3</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9c5ebf49953..6b92e792ad5 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -81,8 +81,8 @@
                                 <form string="Expense Lines">
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
                                     <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
-                                    <field name="name" select="1"/>
-                                    <field name="date_value" select="1"/>
+                                    <field name="name" />
+                                    <field name="date_value" />
                                     <field name="unit_quantity"/>
                                     <field name="unit_amount"/>
                                     <field name="ref"/>
@@ -126,28 +126,17 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <filter
-                        icon="terp-document-new"
-                        domain="[('state','=','draft')]"
-                        string="Draft"
-                        help="Draft Expense"/>
+                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/>
                       <separator orientation="vertical"/>
-                      <filter
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','=','confirm')]"
-                        string="To Validate"
+                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"
                         help="Confirmed Expense"/>
-                      <filter
-                        icon="terp-gtk-go-back-rtl"
-                        domain="[('state','=','accepted')]"
-                        string="To Pay"
+                      <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" string="User">
-                      <filter icon="terp-personal+"
-                            domain="[('department_id','=',context.get('department_id',False))]"
+                      <field name="user_id"  string="User">
+                      <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
                       <field name="department_id" widget="selection" groups="base.group_extended"/>
@@ -171,23 +160,20 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4"
-           parent="hr.menu_hr_root"/>
-
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
-           parent="next_id_49" groups="hr.group_hr_manager"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="hr.group_hr_manager"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
-         <field name="name">product.product.expense.form</field>
-         <field name="model">product.product</field>
-         <field name="inherit_id" ref="product.product_normal_form_view"/>
-         <field name="type">form</field>
-         <field name="arch" type="xml">
+            <field name="name">product.product.expense.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
             <field name="purchase_ok" position="after">
                <field name="hr_expense_ok"/>
             </field>
-         </field>
-      </record>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 57163b6df5f..972cdcaab8f 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -27,18 +27,21 @@
             <field name="kind">function</field>
             <field name="action">write({'state': 'draft'})</field>
         </record>
+
         <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">expense_confirm()</field>
         </record>
+
         <record id="act_accepted" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">accepted</field>
             <field name="kind">function</field>
             <field name="action">expense_accept()</field>
         </record>
+
         <record id="act_paid" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">paid</field>
@@ -46,6 +49,7 @@
             <field name="action">expense_paid()</field>
             <field name="flow_stop">True</field>
         </record>
+
         <record id="act_refused" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">refused</field>
@@ -53,6 +57,7 @@
             <field name="action">expense_canceled()</field>
 <!--            <field name="flow_stop">True</field>-->
         </record>
+
         <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">invoice</field>
@@ -66,24 +71,28 @@
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">confirm</field>
         </record>
+
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_accepted"/>
             <field name="signal">validate</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <!--record model="workflow.transition" id="t3">
 			<field name="act_from" ref="act_accepted" />
 			<field name="act_to" ref="act_paid" />
 			<field name="signal">paid</field>
 			<field name="role_id" ref="HR"/>
 		</record-->
+
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t5" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_refused"/>
@@ -96,33 +105,39 @@
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t7" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
             <field name="role_id" ref="HR"/>
         </record>
+
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice</field>
             <field name="role_id" ref="HR_INV"/>
         </record>
+
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_paid"/>
             <field name="signal">subflow.paid</field>
         </record>
+
         <record id="t10" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">subflow.cancel</field>
         </record>
+
 		<record id="t11" model="workflow.transition">
             <field name="act_from" ref="act_refused"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
             <field name="role_id" ref="HR"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index 4ddd1d33933..ad0c48a0819 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import expense
 import hr_expense_report
 
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index ae368e8ef8e..7078c23d244 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -24,11 +24,10 @@ from report import report_sxw
 import datetime
 
 class expense(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(expense, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-        })
+        self.localcontext.update({'time': time, })
 
 report_sxw.report_sxw('report.hr.expense', 'hr.expense.expense', 'addons/hr_expense/report/expense.rml',parser=expense)
 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 9657b687c18..1a21de08ee2 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+
     <record id="view_hr_expense_report_tree" model="ir.ui.view">
         <field name="name">hr.expense.report.tree</field>
         <field name="model">hr.expense.report</field>
@@ -58,33 +59,21 @@
 	                    name="month"
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Expenses during last month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
-	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last 7 days"/>
+		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
-	                    icon="terp-document-new"
-	                    domain="[('state','=','draft')]"
-	                    help = "Draft Expenses"/>
-		            <filter string="Waiting"
-		                icon="terp-gtk-media-pause"
-		                domain="[('state', '=' ,'confirm')]"
+	                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
+		            <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
 		                help = "Confirm Expenses"/>
-	                <filter string="Accepted"
-	                    icon="terp-camera_test"
-	                    domain="[('state','=','accepted')]"
+	                <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
 	                    help = "Accepted Expenses"/>
-	                <filter string="Cancelled"
-	                    icon="terp-dialog-close"
-	                    domain="[('state','=','cancelled')]"
+	                <filter string="Cancelled" icon="terp-dialog-close" domain="[('state','=','cancelled')]"
 	                    help = "Cancelled Expenses"/>
 	  				<separator orientation="vertical"/>
                     <field name="employee_id"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -105,20 +94,19 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="department_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <field name="date_valid"/>
-
+                <field name="product_id"/>
+                <separator orientation="vertical"/>
+                <field name="journal_id" widget="selection"/>
+                <separator orientation="vertical"/>
+                <field name="department_id"/>
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <separator orientation="vertical"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                <newline/>
+                <field name="date"/>
+                <field name="date_confirm"/>
+                <field name="date_valid"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 9fc701068ef..7144aa19ba8 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -22,5 +22,6 @@
 import hr_holidays
 import report
 import wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 10e533203ba..e322a2d8786 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    "name" : "Human Resources: Holidays management",
-    "version" : "1.5",
-    "author" : "Tiny & Axelor",
-    "category" : "Generic Modules/Human Resources",
-    "website" : "http://www.openerp.com",
+    "name": "Human Resources: Holidays management",
+    "version": "1.5",
+    "author": "Tiny & Axelor",
+    "category": "Generic Modules/Human Resources",
+    "website": "http://www.openerp.com",
     "description": """Human Ressources: Holidays tracking and workflow
 
     This module allows you to manage leaves and leaves requests.
@@ -64,7 +64,7 @@
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
         #'process/hr_holidays_process.xml'
-    ],
+        ],
     'demo_xml': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml'],
     'installable': True,
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 026552f9801..4f3f2142447 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-		        <field name="domain">[('user_id','=',uid)]</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_holidays.open_allocation_holidays"/>
         </record>
         
@@ -21,6 +21,7 @@
 	        <field name="domain">[('user_id','=',uid)]</field>
 	        <field name="view_id" ref="hr_holidays.view_hr_holidays_remaining_leaves_user_graph"/>
 		</record>
+
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
diff --git a/addons/hr_holidays/hr_bel_holidays_2008.xml b/addons/hr_holidays/hr_bel_holidays_2008.xml
index 0c09586cb0c..7b9a305704b 100644
--- a/addons/hr_holidays/hr_bel_holidays_2008.xml
+++ b/addons/hr_holidays/hr_bel_holidays_2008.xml
@@ -8,59 +8,69 @@
             <field name="date_to">2008-01-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Easter Monday</field>
             <field name="date_from">2008-03-24 08:00</field>
             <field name="date_to">2008-03-24 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Labour Day</field>
             <field name="date_from">2008-05-01 08:00</field>
             <field name="date_to">2008-05-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Ascension</field>
             <field name="date_from">2008-05-02 08:00</field>
             <field name="date_to">2008-05-02 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Pentecost Monday</field>
             <field name="date_from">2008-05-12 08:00</field>
             <field name="date_to">2008-05-12 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">National Day</field>
             <field name="date_from">2008-07-21 08:00</field>
             <field name="date_to">2008-07-21 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Assumption Day</field>
             <field name="date_from">2008-08-15 08:00</field>
             <field name="date_to">2008-08-15 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">All Saints</field>
             <field name="date_from">2008-11-01 08:00</field>
             <field name="date_to">2008-11-01 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Armistice</field>
             <field name="date_from">2008-11-11 08:00</field>
             <field name="date_to">2008-11-11 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
         <record model="hr.holidays">
             <field name="name">Christmas</field>
             <field name="date_from">2008-12-25 08:00</field>
             <field name="date_to">2008-12-25 18:00</field>
             <field name="holiday_status" ref="hr.jf" />
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 9e3bfca0660..a5ffdbdfc49 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -20,6 +20,7 @@
 #     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 import datetime
 
@@ -69,6 +70,7 @@ class hr_holidays_status(osv.osv):
         return_false = False
         employee_id = False
         res = {}
+        
         if context and context.has_key('employee_id'):
             if not context['employee_id']:
                 return_false = True
@@ -100,7 +102,7 @@ class hr_holidays_status(osv.osv):
     _defaults = {
         'color_name': 'red',
         'active': True,
-    }
+        }
 
 hr_holidays_status()
 
@@ -110,22 +112,22 @@ class hr_holidays(osv.osv):
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
-        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
         if ids:
             return ids[0]
         return False
 
     _columns = {
-        'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Validation'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
             If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
-        'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
-        'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id' : fields.many2one("hr.holidays.status", " Leave  Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id' : fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        'manager_id' : fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
-        'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
+        'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
+        'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'case_id': fields.many2one('crm.meeting', 'Case'),
@@ -140,13 +142,13 @@ class hr_holidays(osv.osv):
             }
 
     _defaults = {
-        'employee_id' : _employee_get ,
-        'state' : 'draft',
+        'employee_id': _employee_get ,
+        'state': 'draft',
         'type': 'remove',
         'allocation_type': 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
-    }
+        }
 
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
@@ -215,10 +217,10 @@ class hr_holidays(osv.osv):
                     self.unlink(cr, uid, list_ids)
 
     def _check_date(self, cr, uid, ids):
-        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to', 'type']):
+        for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
             if rec['number_of_days_temp'] < 0:
                 return False
-            if rec['type']=='add':
+            if rec['type'] == 'add':
                 continue
             date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
             date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
@@ -249,7 +251,7 @@ class hr_holidays(osv.osv):
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
         return self.onchange_date_from(cr, uid, ids, date_to, date_from)
 
-    def onchange_sec_id(self, cr, uid, ids, status, context={}):
+    def onchange_sec_id(self, cr, uid, ids, status, context=None):
         warning = {}
         if status:
             brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0]
@@ -263,7 +265,7 @@ class hr_holidays(osv.osv):
     def set_to_draft(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         self.write(cr, uid, ids, {
-            'state':'draft',
+            'state': 'draft',
             'manager_id': False,
             'number_of_days': 0,
         })
@@ -274,7 +276,7 @@ class hr_holidays(osv.osv):
     def holidays_validate2(self, cr, uid, ids, *args):
         vals = {'state':'validate1'}
         self.check_holidays(cr, uid, ids)
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
         else:
@@ -287,17 +289,17 @@ class hr_holidays(osv.osv):
         data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
         vals = {'state':'validate'}
-        ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         if ids2:
             if data_holiday[0].state == 'validate1':
                 vals['manager_id2'] = ids2[0]
             else:
                 vals['manager_id'] = ids2[0]
         else:
-            raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+            raise osv.except_osv(_('Warning !'), _('No user related to the selected employee.'))
         self.write(cr, uid, ids, vals)
         for record in data_holiday:
-            if record.holiday_type=='employee' and record.type=='remove':
+            if record.holiday_type == 'employee' and record.type == 'remove':
                 vals = {
                    'name': record.name,
                    'date_from': record.date_from,
@@ -308,7 +310,7 @@ class hr_holidays(osv.osv):
                    'holiday_id': record.id
                      }
                 self._create_resource_leave(cr, uid, vals)
-            elif record.holiday_type=='category' and record.type=='remove':
+            elif record.holiday_type == 'category' and record.type == 'remove':
                 emp_ids = obj_emp.search(cr, uid, [('category_id', '=', record.category_id.id)])
                 for emp in obj_emp.browse(cr, uid, emp_ids):
                     vals = {
@@ -327,13 +329,13 @@ class hr_holidays(osv.osv):
         for record in self.browse(cr, uid, ids):
             user_id = False
             leave_asked = record.number_of_days_temp
-            if record.holiday_type=='employee' and record.type == 'remove':
+            if record.holiday_type == 'employee' and record.type == 'remove':
                 if record.employee_id and not record.holiday_status_id.limit:
                     leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < leave_asked:
                         raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))
                 nb = -(record.number_of_days_temp)
-            elif record.holiday_type=='category' and record.type == 'remove':
+            elif record.holiday_type == 'category' and record.type == 'remove':
                 if record.category_id and not record.holiday_status_id.limit:
                     leaves_rest = self.pool.get('hr.holidays.status').get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                     if leaves_rest < leave_asked:
@@ -342,20 +344,14 @@ class hr_holidays(osv.osv):
             else:
                 nb = record.number_of_days_temp
 
-            if record.holiday_type=='employee' and record.employee_id:
+            if record.holiday_type == 'employee' and record.employee_id:
                 user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
 
-            self.write(cr, uid, [record.id], {
-                'state':'confirm',
-                'number_of_days': nb,
-                'user_id': user_id
-            })
+            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
-        vals = {
-            'state':'refuse',
-        }
+        vals = {'state': 'refuse'}
         ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
         if ids2:
             vals['manager_id'] = ids2[0]
@@ -364,22 +360,18 @@ class hr_holidays(osv.osv):
 
     def holidays_cancel(self, cr, uid, ids, *args):
         self._update_user_holidays(cr, uid, ids)
-        self.write(cr, uid, ids, {
-            'state':'cancel'
-            })
+        self.write(cr, uid, ids, {'state': 'cancel'})
         self._remove_resouce_leave(cr, uid, ids)
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {
-            'state':'draft'
-        })
+        self.write(cr, uid, ids, {'state': 'draft'})
         return True
 
     def check_holidays(self, cr, uid, ids):
         for record in self.browse(cr, uid, ids):
             if not record.number_of_days:
-                raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
+                raise osv.except_osv(_('Warning!'), _('Wrong leave definition.'))
             if record.holiday_type=='employee' and record.employee_id:
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
@@ -387,7 +379,7 @@ class hr_holidays(osv.osv):
                         leaves_rest = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
                         if leaves_rest < -(leave_asked):
                             raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-            elif record.holiday_type=='category' and record.category_id:
+            elif record.holiday_type == 'category' and record.category_id:
                 leave_asked = record.number_of_days
                 if leave_asked < 0.00:
                     if not record.holiday_status_id.limit:
@@ -415,7 +407,7 @@ class hr_holidays(osv.osv):
                     user_id = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
                     if user_id:
                         vals['user_id'] = user_id[0]
-                    holiday_ids.append(self.create(cr, uid, vals, context={}))
+                    holiday_ids.append(self.create(cr, uid, vals, context=None))
                 self.holidays_confirm(cr, uid, holiday_ids)
                 self.holidays_validate(cr, uid, holiday_ids)
 
@@ -444,7 +436,7 @@ class hr_holidays(osv.osv):
                     'date' : record.date_from,
                 }
                 case_id = self.pool.get('crm.meeting').create(cr, uid, vals)
-                self.write(cr, uid, ids, {'case_id':case_id})
+                self.write(cr, uid, ids, {'case_id': case_id})
 
         return True
 
@@ -455,8 +447,8 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-                }
+        }
 
 resource_calendar_leaves()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 23d1e1a75bf..4c8ec39a1af 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<report id="report_holidays_summary"
-				string="Summary Of Leaves"
-				model="hr.holidays"
-				name="holidays.summary"
-				xsl="hr_holidays/report/holidays_summary.xsl"
-				auto="False"
-				menu="False"/>
+    <data>
 
-	</data>
+        <report id="report_holidays_summary"
+                string="Summary Of Leaves"
+                model="hr.holidays"
+                name="holidays.summary"
+                xsl="hr_holidays/report/holidays_summary.xsl"
+                auto="False"
+                menu="False"/>
+
+    </data>
 </openerp>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 98c8d558f3a..bd96de3dd82 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
@@ -16,8 +17,7 @@
                         <field name="user_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
-                                domain="[('department_id.manager_id','=',uid)]"
-                                />
+                                domain="[('department_id.manager_id','=',uid)]" />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
@@ -44,33 +44,33 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130"/>
+                    <field name="name" />
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130"/>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                            <field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                            <field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-	                        <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
                             <field name="department_id"/>
-	                        <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-	                        <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
-	                        <field name="number_of_days_temp"/>
+                            <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                            <field name="date_to" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                            <field name="number_of_days_temp"/>
                             <newline/>
                             <field name="manager_id"/>
                             <field name="manager_id2"/>
                             <separator string="Notes" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" select="1" colspan="2"/>
+                            <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-								<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
+                                <button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
@@ -82,56 +82,55 @@
         </record>
 
         <!-- Holidays: Allocation Request -->
-		<record model="ir.ui.view" id="allocation_leave_new">
-			<field name="name">Allocation Request</field>
-			<field name="model">hr.holidays</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-			<form string="Allocation Request">
-				<group col="4" colspan="4">
-					<field name="name" select="1"/>
-					<field name="holiday_status_id" select="1"/>
-					<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
-					<group col="2" colspan="2">
-						<group attrs="{'invisible':[('holiday_type','=','category')]}">
-    						<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
-						</group>
-						<group attrs="{'invisible':[('holiday_type','=','employee')]}">
-    	   					<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
-						</group>
-					</group>
-				</group>
-				<notebook colspan="4">
-					<page string="General">
-						<field name="number_of_days_temp"/>
-						<field name="department_id"/>
-						<field name="manager_id"/>
-						<field name="manager_id2"/>
-						<separator string="Notes" colspan="4"/>
-						<field name="notes" nolabel="1" colspan="4" />
-						<newline/>
-						<field name="state" select="1" colspan="2"/>
-						<group colspan="2">
-							<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-							<button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-							<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-							<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-							<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-							<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
-						</group>
-					</page>
-				</notebook>
-			</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="allocation_leave_new">
+            <field name="name">Allocation Request</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Allocation Request">
+                <group col="4" colspan="4">
+                    <field name="name" />
+                    <field name="holiday_status_id" />
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
+                    <group col="2" colspan="2">
+                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
+                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        </group>
+                        <group attrs="{'invisible':[('holiday_type','=','employee')]}">
+                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        </group>
+                    </group>
+                </group>
+                <notebook colspan="4">
+                    <page string="General">
+                        <field name="number_of_days_temp"/>
+                        <field name="department_id"/>
+                        <field name="manager_id"/>
+                        <field name="manager_id2"/>
+                        <separator string="Notes" colspan="4"/>
+                        <field name="notes" nolabel="1" colspan="4" />
+                        <newline/>
+                        <field name="state" colspan="2"/>
+                        <group colspan="2">
+                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                            <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                            <button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                </notebook>
+            </form>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_holiday_allocation_tree">
             <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves"
-                    colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -151,22 +150,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Management">
-                    <field name="name" select="1"/>
-                    <field name="holiday_status_id" select="1"/>
+                    <field name="name" />
+                    <field name="holiday_status_id" />
 <!--                    <field name="holiday_type"/>
-                    <field name="category_id" select="1" required="1"/>
--->                    <field name="employee_id" select="1" />
+                    <field name="category_id" required="1"/>
+-->                    <field name="employee_id"  />
                     <!--<field name="department_id"/>-->
                     <field name="type"/>
-                    <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_to" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="number_of_days_temp"/>
                     <notebook colspan="4">
                         <page string="General">
                             <field name="manager_id"/>
                             <field name="notes" colspan="4"/>
                             <newline/>
-                            <field name="state" select="1" colspan="2"/>
+                            <field name="state" colspan="2"/>
                             <group colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -207,8 +206,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves"
-                    colors="red:state == 'refuse';grey:state == 'cancel'">
+                <tree string="Leaves" colors="red:state == 'refuse';grey:state == 'cancel'">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -242,7 +240,7 @@
         </record>
 -->
         <menuitem
-            name="Holidays Management"
+            name="Holidays"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"
             sequence="5"/>
@@ -257,56 +255,48 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-     <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_holiday"/>
-        <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday"/>
+            <field name="act_window_id" ref="open_ask_holidays"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="edit_holiday_new"/>
-        <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="edit_holiday_new"/>
+            <field name="act_window_id" ref="open_ask_holidays"/>
+        </record>
 
+        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new"
+             action="open_ask_holidays"/>
 
-    <menuitem
-       name="Leave Requests"
-         parent="menu_open_ask_holidays"
-         id="menu_open_ask_holidays_new"
-         action="open_ask_holidays"/>
+        <record model="ir.actions.act_window" id="open_allocation_holidays">
+            <field name="name">Allocation Requests</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
 
-	<record model="ir.actions.act_window" id="open_allocation_holidays">
-	    <field name="name">Allocation Requests</field>
-	    <field name="res_model">hr.holidays</field>
-	    <field name="view_type">form</field>
-	    <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
-	    <field name="domain">[('type','=','add')]</field>
-	    <field name="view_id" ref="allocation_leave_new"/>
-	    <field name="search_view_id" ref="view_hr_holidays_filter"/>
-	</record>
+        <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday_allocation_tree"/>
+            <field name="act_window_id" ref="open_allocation_holidays"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_holiday_allocation_tree"/>
-        <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="act_window_id" ref="open_allocation_holidays"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="allocation_leave_new"/>
-        <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>
-
-
-     <menuitem
-          name="Allocation Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_open_allocation_holidays"
+        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays"
             action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
@@ -333,15 +323,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name" />
                     <field name="limit"/>
                     <field name="active"/>
-                    <field name="categ_id"  select="1" widget="selection"/>
+                    <field name="categ_id" widget="selection"/>
                     <field name="color_name"/>
                     <field name="double_validation" />
                 </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_holiday_status_tree">
             <field name="name">hr.holidays.status.tree</field>
             <field name="model">hr.holidays.status</field>
@@ -354,6 +345,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
@@ -368,18 +360,18 @@
             id="menu_open_view_holiday_status"
             parent="hr.menu_open_view_attendance_reason_config"/>
 
-	<!-- holiday on resource leave -->
+    <!-- holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form.inherit</field>
             <field name="model">resource.calendar.leaves</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
-            	<field name="date_to" position="after">
-            		<field name="holiday_id"/>
-            	</field>
+                <field name="date_to" position="after">
+                    <field name="holiday_id"/>
+                </field>
             </field>
-    	</record>
+        </record>
 
     <!--  Shortcuts -->
         <act_window name="Holidays"
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index c2873ed9ace..4374e2b461a 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,31 +1,16 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	  <menuitem
+    <data>
+      <menuitem
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
             sequence="10" />
+
      <menuitem
             id="menu_hr_reporting_holidays"
             name="Holidays"
             parent="hr.menu_hr_reporting"
             sequence="6" />
-	<!--<wizard string="Holidays by Departement"
-		  name="hr.holidays.summary"
-		  id="holidays_summary"/>-->
-	<!--<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
-                  icon="STOCK_PRINT"
-		 action="holidays_summary"
-		 type="wizard"
-		 id="menu_holidays_summary" sequence="20"/>
-	 <record model='ir.ui.menu' id="menu_holidays_summary">
-		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
-  	 </record>
--->
-
-	<!--<wizard string="Employee's Holidays"
-		model="hr.employee" name="hr.holidays.summary.employee"
-		keyword="client_print_multi" id="wizard_holidays_summary" />-->
  	</data>
 </openerp>
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 5949e527f6a..8ab371c67d7 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 import tools
 
@@ -32,19 +33,19 @@ class available_holidays_report(osv.osv):
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'employee_id': fields.many2one ('hr.employee', "Employee's Name", readonly=True),
-        'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
+        'category_id': fields.many2one('hr.employee.category', "Category's Name", readonly=True),
         'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
         'max_leave': fields.float('Allocated Leaves', readonly=True),
         'taken_leaves': fields.float('Taken Leaves', readonly=True),
-        'remaining_leave': fields.float('Remaining Leaves',readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'remaining_leave': fields.float('Remaining Leaves', readonly=True),
+        'department_id': fields.many2one('hr.department', 'Department', readonly=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'available_holidays_report')
         cr.execute("""
-            create or replace view available_holidays_report as (
-                select
+            CREATE or REPLACE view available_holidays_report as (
+                SELECT
                     min(h.id) as id,
                     date_trunc('day',h.create_date) as date,
                     to_char(s.create_date, 'YYYY') as year,
@@ -67,15 +68,16 @@ class available_holidays_report(osv.osv):
                                                      and employee_id=h.employee_id
                                                      and holiday_status_id=h.holiday_status_id
                                                      and state='validate') as max_leave
-                from hr_holidays h
-                left join hr_holidays_status s on (s.id = h.holiday_status_id)
-                where h.state='validate'
+                FROM hr_holidays h
+                LEFT JOIN hr_holidays_status s on (s.id = h.holiday_status_id)
+                WHERE h.state='validate'
                 and s.active <> 'f'
-                group by h.holiday_status_id, h.employee_id,
+                GROUP BY h.holiday_status_id, h.employee_id,
                          date_trunc('day',h.create_date),to_char(s.create_date, 'YYYY'),
                          to_char(s.create_date, 'MM'), to_char(s.create_date, 'YYYY-MM-DD'), h.user_id,h.state, h.category_id, h.department_id
 
             )""")
+
 available_holidays_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 327cdab032b..111d8d2f8a6 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -48,38 +48,28 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-	                    <filter icon="terp-personal" string="Employee"
-	                            domain="[('category_id', '=', False)]"
+	                    <filter icon="terp-personal" string="Employee" domain="[('category_id', '=', False)]"
 	                            help="Leaves by empolyee"/>
 	                    <filter icon="terp-stock_symbol-selection" string="Category"
-	                            domain="[('employee_id', '=', False)]"
-	                            help="Leaves by category"/>
+	                            domain="[('employee_id', '=', False)]" help="Leaves by category"/>
                         <separator orientation="vertical"/>
 		            	<filter icon="terp-go-year" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
-		                <filter icon="terp-go-month" string="This Month"
-		                    name="month"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves in this month"/>
-			            <filter icon="terp-go-week"
-		                    string="    7 Days    "
-		                    separator="1"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves during last 7 days"/>
+		                <filter icon="terp-go-month" string="This Month" name="month"
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
+			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-
 						<field name="employee_id"/>
 		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-personal"
-		                        string="My Leaves"
-		                        domain="[('user_id','=',uid)]"/>
+		                    <filter icon="terp-personal" string="My Leaves" domain="[('user_id','=',uid)]"/>
 		                </field>
 		            </group>
 		            <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12">
-	                    <field name="holiday_status_id" widget="selection"/>
-	                	<field name="department_id" widget="selection"/>
+                    <field name="holiday_status_id" widget="selection"/>
+                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="0" string="Group By..." colspan="10" col="12">
@@ -96,8 +86,6 @@
 	        </field>
 	    </record>
 
-
-
         <record id="action_hr_available_holidays_report" model="ir.actions.act_window">
             <field name="name">Available Holidays</field>
             <field name="res_model">available.holidays.report</field>
@@ -112,20 +100,17 @@
                 <field name="view_mode">tree</field>
                 <field name="view_id" ref="view_hr_available_holidays_report_tree"/>
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-            </record>
-
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_graph">
                 <field name="sequence" eval="2"/>
                 <field name="view_mode">graph</field>
                 <field name="view_id" ref="view_hr_available_holidays_report_graph"/>
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-            </record>
-
+        </record>
 
         <menuitem name="Available Holidays" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
 
-
 	</data>
 </openerp>
 
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index 31fbe91a5a2..a0fa2cdd131 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -234,8 +234,8 @@ class report_custom(report_rml):
                     continue
                 dept_done=0
                 for d in range(0,len(result)):
-                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id','=',result[d][0])])
-                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id','name'])
+                    emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id', '=', result[d][0])])
+                    items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id', 'name'])
                     for item in items:
 #                        if item['id'] in done:
 #                            continue
@@ -261,5 +261,6 @@ class report_custom(report_rml):
         return xml
 
 report_custom('report.holidays.summary', 'hr.holidays', '', 'addons/hr_holidays/report/holidays_summary.xsl')
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 38995351a32..8f8ec56ffeb 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import tools
 from osv import fields,osv
 
@@ -70,8 +71,8 @@ class hr_holidays_report(osv.osv):
                      s.state
                      from
                  hr_holidays s
-                 where type='remove'
-                 group by
+                 WHERE type='remove'
+                 GROUP BY
                      s.create_date,s.state,s.date_from,s.date_to,
                      s.employee_id,s.user_id,s.holiday_status_id,
                      s.department_id, s.category_id
@@ -89,26 +90,26 @@ class hr_holidays_remaining_leaves_user(osv.osv):
         'no_of_leaves': fields.integer('Remaining leaves'),
         'user_id': fields.many2one('res.users', 'User'),
         'leave_type': fields.char('Leave Type', size=64),
+        }
 
-    }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'hr_holidays_remaining_leaves_user')
         cr.execute("""
-            create or replace view hr_holidays_remaining_leaves_user as (
-                 select
+            CREATE or REPLACE view hr_holidays_remaining_leaves_user as (
+                 SELECT
                     min(hrs.id) as id,
                     rr.name as name,
                     sum(hrs.number_of_days) as no_of_leaves,
                     rr.user_id as user_id,
                     hhs.name as leave_type
-                from
+                FROM
                     hr_holidays as hrs, hr_employee as hre,
                     resource_resource as rr,hr_holidays_status as hhs
-                where
+                WHERE
                     hrs.employee_id = hre.id and
                     hre.resource_id =  rr.id and
                     hhs.id = hrs.holiday_status_id
-                group by
+                GROUP BY
                     rr.name,rr.user_id,hhs.name
             )
         """)
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 7f42982eaad..a367506bce5 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -45,37 +45,23 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
-                    <filter icon="terp-personal" string="Employee"
-                            domain="[('category_id', '=', False)]"
+                    <filter icon="terp-personal" string="Employee" domain="[('category_id', '=', False)]"
                             help="Leaves by empolyee"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category"
-                            domain="[('employee_id', '=', False)]"
+                    <filter icon="terp-stock_symbol-selection" string="Category" domain="[('employee_id', '=', False)]"
                             help="Leaves by category"/>
 	            	<separator orientation="vertical"/>
 	            	<filter icon="terp-go-year" string="This Year"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Leaves in this year"/>
-	                <filter icon="terp-go-month" string="This Month"
-	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Leaves in this month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
-	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Leaves during last 7 days"/>
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this year"/>
+	                <filter icon="terp-go-month" string="This Month" name="month"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
+		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter string="Draft"
-	                	icon="terp-document-new"
-	                	domain="[('state','=','draft')]"
+	                <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]"
 	                	help = "Draft Leaves"/>
-	                <filter string="Waiting Validation"
-	                	icon="terp-gtk-media-pause"
-	                	domain="[('state', '=' ,'confirm')]"
+	                <filter string="Waiting Validation" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
 	                	help = "In progress Leaves"/>
-	               	<filter string="Validated"
-	               		icon="terp-camera_test"
-	               		domain="[('state','=','validate')]"
+	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
 					<field name="employee_id" widget="selection"/>
@@ -96,18 +82,14 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-gtk-stop"
-                            string="Refused"
-                        name="done"
+                    <filter icon="terp-gtk-stop" string="Refused" name="done"
                             domain="[('state','=','refuse')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_from"/>
                     <separator orientation="vertical"/>
                     <field name="holiday_status_id" widget="selection"/>
                     <newline/>
-                    <filter icon="terp-gtk-stop"
-                            string="Cancelled"
-                            domain="[('state','=','cancel')]"/>
+                    <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_to"/>
                     <separator orientation="vertical"/>
@@ -122,7 +104,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by':[]}</field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1, 'group_by':[]} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 8626b3de8ad..d928a8dcb9b 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -9,4 +9,3 @@
 "access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_manager",1,1,1,1
 "access_hr_holidays_report_user","hr.holidays.report","model_hr_holidays_report","hr.group_hr_user",1,0,0,0
 "access_available_holidays_report_user","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_summary_dept","hr.holidays.summary.dept","model_hr_holidays_summary_dept","hr.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 9c6d1447f89..af9c92d9f59 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -31,12 +31,12 @@ class hr_holidays_summary_dept(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
-                }
+        }
 
     _defaults = {
          'date_from': time.strftime('%Y-%m-%d'),
          'holiday_type': 'Validated'
-                 }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [])[0]
@@ -55,4 +55,5 @@ class hr_holidays_summary_dept(osv.osv_memory):
             }
 
 hr_holidays_summary_dept()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 1452c864c7f..8ca69ef9274 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -30,12 +30,12 @@ class hr_holidays_summary_employee(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
-                }
+        }
 
     _defaults = {
          'date_from': time.strftime('%Y-%m-%d'),
          'holiday_type': 'Validated',
-                 }
+        }
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [])[0]
@@ -53,4 +53,4 @@ class hr_holidays_summary_employee(osv.osv_memory):
 
 hr_holidays_summary_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
index 9ea0d7eb8c4..ee49b4e7794 100644
--- a/addons/hr_payroll/__init__.py
+++ b/addons/hr_payroll/__init__.py
@@ -2,7 +2,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -23,4 +23,6 @@
 
 import hr_payroll
 import report
-import wizard
\ No newline at end of file
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 9f1c59abc4f..e0554c1738f 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -38,7 +38,7 @@
     'depends': [
         'hr',
         'account',
-        'hr_contract', 
+        'hr_contract',
         'hr_holidays',
         'hr_expense'
     ],
@@ -50,10 +50,16 @@
         'hr_payroll_sequence.xml',
         'hr_paroll_report.xml',
         'hr_payroll_data.xml',
-        'hr_payroll_wizard.xml'
+        'wizard/hr_payroll_create_analytic.xml',
+        'wizard/hr_payroll_employees_detail.xml',
+        'wizard/hr_payroll_year_salary.xml',
+
     ],
     'demo_xml': [
+        'hr_payroll_demo.xml'
     ],
     'installable': True,
     'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 93146b565b9..14e3e231f4a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -50,7 +50,7 @@ class hr_contract_wage_type(osv.osv):
     Grows = Basic + Allowances
     New = Grows - Deductions
     """
-    
+
     _inherit = 'hr.contract.wage.type'
     _columns = {
         'type' : fields.selection([('basic','Basic'), ('gross','Gross'), ('net','Net')], 'Type', required=True),
@@ -62,10 +62,10 @@ class hr_passport(osv.osv):
     Employee Passport
     Passport based Contratacts for Employees
     """
-    
+
     _name = 'hr.passport'
     _description = 'Passport Detail'
-    
+
     _columns = {
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'name':fields.char('Passport No', size=64, required=True, readonly=False),
@@ -85,7 +85,7 @@ class hr_payroll_structure(osv.osv):
     - Allowlance
     - Deductions
     """
-    
+
     _name = 'hr.payroll.structure'
     _description = 'Salary Structure'
 
@@ -102,7 +102,7 @@ class hr_payroll_structure(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
     }
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Create a new record in hr_payroll_structure model from existing one
@@ -111,7 +111,7 @@ class hr_payroll_structure(osv.osv):
         @param id: list of record ids on which copy method executes
         @param default: dict type contains the values to be override during copy of object
         @param context: context arguments, like lang, time zone
-        
+
         @return: returns a id of newly created record
         """
         code = self.browse(cr, uid, id).code
@@ -121,7 +121,7 @@ class hr_payroll_structure(osv.osv):
         }
         res_id = super(hr_payroll_structure, self).copy(cr, uid, id, default, context)
         return res_id
-    
+
 hr_payroll_structure()
 
 class hr_contract(osv.osv):
@@ -129,10 +129,10 @@ class hr_contract(osv.osv):
     Employee contract based on the visa, work permits
     allowas to configure different Salary structure
     """
-    
+
     _inherit = 'hr.contract'
     _description = 'Employee Contract'
-    
+
     _columns = {
         'permit_no':fields.char('Work Permit No', size=256, required=False, readonly=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
@@ -152,7 +152,7 @@ class payroll_register(osv.osv):
     """
     _name = 'hr.payroll.register'
     _description = 'Payroll Register'
-    
+
     def _calculate(self, cr, uid, ids, field_names, arg, context):
         res = {}
         allounce = 0.0
@@ -165,7 +165,7 @@ class payroll_register(osv.osv):
                 deduction += slip.deduction
                 net += slip.net
                 grows += slip.grows
-                
+
             res[register.id] = {
                 'allounce':allounce,
                 'deduction':deduction,
@@ -173,7 +173,7 @@ class payroll_register(osv.osv):
                 'grows':grows
             }
         return res
-        
+
     _columns = {
         'name':fields.char('Name', size=64, required=True, readonly=False),
         'date': fields.date('Date', required=True),
@@ -194,13 +194,13 @@ class payroll_register(osv.osv):
 #        'advice_ids':fields.one2many('hr.payroll.advice', 'register_id', 'Bank Advice'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, int(config['price_accuracy']))),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, int(config['price_accuracy']))),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, int(config['price_accuracy']))),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, int(config['price_accuracy']))),        
+        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4))),
+        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
+        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 4)),
+        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 4)),
         'note': fields.text('Description'),
     }
-    
+
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'new',
@@ -216,105 +216,57 @@ class payroll_register(osv.osv):
         func_pool = self.pool.get('hr.payroll.structure')
         slip_line_pool = self.pool.get('hr.payslip.line')
         wf_service = netsvc.LocalService("workflow")
-        
-        vals = self.read(cr, uid, ids)[0]
-        
+
+        vals = self.browse(cr, uid, ids)[0]
+
         emp_ids = emp_pool.search(cr, uid, [])
-        
+
         for emp in emp_pool.browse(cr, uid, emp_ids):
-            old_slips = slip_pool.search(cr, uid, [('employee_id','=',emp.id), ('date','=',vals['date'])])
+            old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id), ('date','=',vals.date)])
             if old_slips:
                 slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]})
                 for sid in old_slips:
                     wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
-                continue
-            
-            sql_req= '''
-                SELECT c.wage as wage, struct_id as function
-                FROM hr_contract c
-                  LEFT JOIN hr_employee emp on (c.employee_id=emp.id)
-                  LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id)
-                  LEFT JOIN hr_contract_wage_type_period p on (cwt.period_id = p.id)
-                WHERE
-                  (emp.id=%s) AND
-                  (date_start <= %s) AND
-                  (date_end IS NULL OR date_end >= %s)
-                LIMIT 1
-                '''
-            cr.execute(sql_req, (emp.id, vals['date'], vals['date']))
-            contract_info = cr.dictfetchone()
+            else:
+                res = {
+                    'employee_id':emp.id,
+                    'basic':0.0,
+                    'register_id':ids[0],
+                    'name':vals.name,
+                    'date':vals.date,
+                    'journal_id':vals.journal_id.id,
+                    'bank_journal_id':vals.bank_journal_id.id
+                }
+                slip_id = slip_pool.create(cr, uid, res)
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
 
-            if not contract_info:
-                continue
-            
-            function = contract_info['struct_id']
-            lines = []
-            if function:
-                func = func_pool.read(cr, uid, function, ['line_ids'])
-                lines = slip_line_pool.browse(cr, uid, func['line_ids'])
-            
-            res = {
-                'employee_id':emp.id,
-                'basic':contract_info['wage'],
-                'register_id':ids[0],
-                'name':vals['name'],
-                'date':vals['date'],
-                'journal_id':vals['journal_id'][0],
-                'bank_journal_id':vals['bank_journal_id'][0]
-            }
-            slip_id = slip_pool.create(cr, uid, res)
-
-            old_slip_id = slip_line_pool.search(cr, uid, [('slip_id','=',slip_id)])
-            slip_line_pool.unlink(cr, uid, old_slip_id)
-            
-            for line in lines:
-                slip_line_pool.copy(cr, uid, line.id, {'slip_id':slip_id, 'employee_id':False, 'function_id':False}, {})
-            
-            for line in emp.line_ids:
-                slip_line_pool.copy(cr, uid, line.id, {'slip_id':slip_id, 'employee_id':False, 'function_id':False}, {})
-                
-            wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
-        
         number = self.pool.get('ir.sequence').get(cr, uid, 'salary.register')
         self.write(cr, uid, ids, {'state':'draft', 'number':number})
         return True
 
     def verify_sheet(self, cr, uid, ids, context={}):
         slip_pool = self.pool.get('hr.payslip')
-        
+
         for id in ids:
             sids = slip_pool.search(cr, uid, [('register_id','=',id)])
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'verify_sheet', cr)
-        
+
         self.write(cr, uid, ids, {'state':'hr_check'})
         return True
-    
-    def verify_twice_sheet(self, cr, uid, ids, context={}):
-        slip_pool = self.pool.get('hr.payslip')
-        
-        for id in ids:
-            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','hr_check')])
-            wf_service = netsvc.LocalService("workflow")
-            for sid in sids:
-                wf_service.trg_validate(uid, 'hr.payslip', sid, 'verify_twice_sheet', cr)
-        
-        self.write(cr, uid, ids, {'state':'accont_check'})
-        return True
-    
+
     def final_verify_sheet(self, cr, uid, ids, context={}):
         slip_pool = self.pool.get('hr.payslip')
         advice_pool = self.pool.get('hr.payroll.advice')
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
-        
+
         for id in ids:
-            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','accont_check')])
+            sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','hr_check')])
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'final_verify_sheet', cr)
 
-        
         for reg in self.browse(cr, uid, ids):
             accs = {}
             for slip in reg.line_ids:
@@ -330,7 +282,7 @@ class payroll_register(osv.osv):
                     accs[slip.employee_id.property_bank_account.code] = pid
                 else:
                     pid = accs[slip.employee_id.property_bank_account.code]
-                
+
                 pline = {
                     'advice_id':pid,
                     'name':slip.employee_id.otherid,
@@ -339,7 +291,7 @@ class payroll_register(osv.osv):
                     'bysal':slip.net
                 }
                 id = advice_line_pool.create(cr, uid, pline)
-        
+
         #, 'advice_ids':[(6, 0, [pid])]
         self.write(cr, uid, ids, {'state':'confirm'})
         return True
@@ -351,7 +303,7 @@ class payroll_register(osv.osv):
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'process_sheet', cr)
-        
+
         self.write(cr, uid, ids, {'state':'done'})
         return True
 
@@ -363,7 +315,7 @@ class payroll_advice(osv.osv):
     '''
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice Note'
-    
+
     _columns = {
         'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False),
         'name':fields.char('Name', size=2048, required=True, readonly=False),
@@ -380,7 +332,7 @@ class payroll_advice(osv.osv):
         'account_id': fields.many2one('account.account', 'Account', required=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
     }
-    
+
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
@@ -388,11 +340,11 @@ class payroll_advice(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
     }
-    
+
     def confirm_sheet(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'confirm'})
         return True
-        
+
     def set_to_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
@@ -409,22 +361,22 @@ class payroll_advice_line(osv.osv):
     '''
     _name = 'hr.payroll.advice.line'
     _description = 'Bank Advice Lines'
-    
+
     _columns = {
         'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
         'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
-        'amount': fields.float('Amount', digits=(16, int(config['price_accuracy']))),
-        'bysal': fields.float('By Salary', digits=(16, int(config['price_accuracy']))),
+        'amount': fields.float('Amount', digits=(16, 4)),
+        'bysal': fields.float('By Salary', digits=(16, 4)),
         'flag':fields.char('D/C', size=8, required=True, readonly=False),
     }
     _defaults = {
         'flag': lambda *a: 'C',
     }
-    
+
     def onchange_employee_id(self, cr, uid, ids, ddate, employee_id, context={}):
         vals = {}
-        slip_pool = self.pool.get('hr.payslip')        
+        slip_pool = self.pool.get('hr.payslip')
         if employee_id:
             dates = prev_bounds(ddate)
             sids = False
@@ -445,7 +397,7 @@ class contrib_register(osv.osv):
     '''
     _name = 'hr.contibution.register'
     _description = 'Contribution Register'
-    
+
     def _total_contrib(self, cr, uid, ids, field_names, arg, context={}):
         line_pool = self.pool.get('hr.contibution.register.line')
         period_id = self.pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d')),('date_stop','>=',time.strftime('%Y-%m-%d'))])[0]
@@ -454,26 +406,26 @@ class contrib_register(osv.osv):
         for cur in self.browse(cr, uid, ids):
             current = line_pool.search(cr, uid, [('period_id','=',period_id),('register_id','=',cur.id)])
             years = line_pool.search(cr, uid, [('period_id.fiscalyear_id','=',fiscalyear_id.id), ('register_id','=',cur.id)])
-        
+
             e_month = 0.0
             c_month = 0.0
             for i in line_pool.browse(cr, uid, current):
                 e_month += i.emp_deduction
                 c_month += i.comp_deduction
-            
+
             e_year = 0.0
             c_year = 0.0
             for j in line_pool.browse(cr, uid, years):
                 e_year += i.emp_deduction
                 c_year += i.comp_deduction
-                
+
             res[cur.id]={
                 'monthly_total_by_emp':e_month,
                 'monthly_total_by_comp':c_month,
                 'yearly_total_by_emp':e_year,
                 'yearly_total_by_comp':c_year
             }
-            
+
         return res
 
     _columns = {
@@ -482,10 +434,10 @@ class contrib_register(osv.osv):
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'register_line_ids':fields.one2many('hr.contibution.register.line', 'register_id', 'Register Line', readonly=True),
-        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, int(config['price_accuracy']))),
-        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, int(config['price_accuracy']))),
-        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, int(config['price_accuracy']))),
-        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, int(config['price_accuracy']))),        
+        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
+        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -501,22 +453,22 @@ class contrib_register_line(osv.osv):
     '''
     _name = 'hr.contibution.register.line'
     _description = 'Contribution Register Line'
-  
+
     def _total(self, cr, uid, ids, field_names, arg, context):
         res={}
         for line in self.browse(cr, uid, ids, context):
             res[line.id] = line.emp_deduction + line.comp_deduction
             return res
-    
+
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'register_id':fields.many2one('hr.contibution.register', 'Register', required=False),
         'code':fields.char('Code', size=64, required=False, readonly=False),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'period_id': fields.many2one('account.period', 'Period'),
-        'emp_deduction': fields.float('Employee Deduction', digits=(16, int(config['price_accuracy']))),
-        'comp_deduction': fields.float('Company Deduction', digits=(16, int(config['price_accuracy']))),
-        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, int(config['price_accuracy']))),    
+        'emp_deduction': fields.float('Employee Deduction', digits=(16, 4)),
+        'comp_deduction': fields.float('Company Deduction', digits=(16, 4)),
+        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, 4)),
     }
 contrib_register_line()
 
@@ -524,12 +476,12 @@ class payment_category(osv.osv):
     """
     Allowance, Deduction Heads
     House Rent Allowance, Medical Allowance, Food Allowance
-    Professional Tax, Advance TDS, Providend Funds, etc    
+    Professional Tax, Advance TDS, Providend Funds, etc
     """
-    
+
     _name = 'hr.allounce.deduction.categoty'
     _description = 'Allowance Deduction Heads'
-        
+
     _columns = {
         'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
         'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
@@ -538,13 +490,14 @@ class payment_category(osv.osv):
             ('deduction','Deduction'),
             ('other','Others'),
         ],'Type', select=True),
-        'base':fields.char('Based on', size=64, required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
+        'base':fields.text('Based on', required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
         'condition':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
-        'note': fields.text('Description'),    
+        'note': fields.text('Description'),
         'user_id':fields.char('User', size=64, required=False, readonly=False),
         'state':fields.char('Label', size=64, required=False, readonly=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
+        'contribute_ids':fields.one2many('company.contribution', 'category_id', 'Contributions', required=False),
     }
     _defaults = {
         'condition': lambda *a: 'True',
@@ -561,10 +514,10 @@ class company_contribution(osv.osv):
     Company contribution
     Allows to configure company contribution for some taxes
     """
-    
+
     _name = 'company.contribution'
     _description = "Company Contribution"
-    
+
     _columns = {
         'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Heads', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
@@ -586,7 +539,7 @@ class company_contribution(osv.osv):
             ('fix','Fixed Amount'),
             ('func','Function Calculation'),
         ],'Amount Type', select=True),
-        'contribute_per':fields.float('Contribution', digits=(16, int(config['price_accuracy'])), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
+        'contribute_per':fields.float('Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
         'account_id':fields.property(
             'account.account',
             type='many2one',
@@ -601,7 +554,7 @@ class company_contribution(osv.osv):
         'active':fields.boolean('Active', required=False),
         'note': fields.text('Description'),
     }
-    
+
     _defaults = {
         'amount_type': lambda *a:'fix',
         'active': lambda *a:True,
@@ -609,14 +562,14 @@ class company_contribution(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
     }
-    
+
     def execute_function(self, cr, uid, id, value, context):
         """
         self: pointer to self object
         cr: cursor to database
         uid: user id of current executer
         """
-        
+
         line_pool = self.pool.get('company.contribution.line')
         res = 0
         ids = line_pool.search(cr, uid, [('category_id','=',id), ('to_val','>=',value),('from_val','<=',value)])
@@ -627,40 +580,40 @@ class company_contribution(osv.osv):
         else:
             res = line_pool.browse(cr, uid, ids)[0].value
         return res
-    
+
 company_contribution()
 
 class company_contribution_line(osv.osv):
     """
     Company contribution lines
     """
-    
+
     _name = 'company.contribution.line'
     _description = 'Allowance Deduction Categoty'
     _order = 'sequence'
-    
+
     _columns = {
         'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
         'name':fields.char('Name', size=64, required=False, readonly=False),
         'umo_id':fields.many2one('product.uom', 'Unite', required=False),
-        'from_val': fields.float('From', digits=(16, int(config['price_accuracy']))),
-        'to_val': fields.float('To', digits=(16, int(config['price_accuracy']))),
+        'from_val': fields.float('From', digits=(16, 4)),
+        'to_val': fields.float('To', digits=(16, 4)),
         'amount_type':fields.selection([
             ('fix','Fixed Amount'),
         ],'Amount Type', select=True),
         'sequence':fields.integer('Sequence'),
-        'value': fields.float('Value', digits=(16, int(config['price_accuracy']))),
+        'value': fields.float('Value', digits=(16, 4)),
     }
 company_contribution_line()
 
 class hr_holidays_status(osv.osv):
     _inherit = "hr.holidays.status"
-    
+
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'type':fields.selection([
-            ('paid','Paid Holiday'), 
-            ('unpaid','Un-Paid Holiday'), 
+            ('paid','Paid Holiday'),
+            ('unpaid','Un-Paid Holiday'),
             ('halfpaid','Half-Pay Holiday')
             ], string='Payment'),
         'account_id': fields.many2one('account.account', 'Account', required=False),
@@ -690,14 +643,14 @@ class hr_payslip(osv.osv):
     '''
     _name = 'hr.payslip'
     _description = 'Pay Slip'
-    
+
     def _calculate(self, cr, uid, ids, field_names, arg, context):
         res = {}
         for rs in self.browse(cr, uid, ids, context):
             allow = 0.0
             deduct = 0.0
             others = 0.0
-            
+
             obj = {
                 'basic':rs.basic
             }
@@ -709,22 +662,22 @@ class hr_payslip(osv.osv):
                 obj.update({
                     'net':rs.inet
                 })
-            
+
             for line in rs.line_ids:
                 amount = 0.0
-                
+
                 if line.amount_type == 'per':
                     try:
                         amount = line.amount * eval(str(line.category_id.base), obj)
                     except Exception, e:
                         raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
-                    
+
                 elif line.amount_type in ('fix', 'func'):
                     amount = line.amount
 
                 cd = line.category_id.code.lower()
                 obj[cd] = amount
-                
+
                 contrib = 0.0
 #                if line.category_id.include_in_salary:
 #                    contrib = line.company_contrib
@@ -743,9 +696,9 @@ class hr_payslip(osv.osv):
                     others += amount
                 elif line.type == 'otherpay':
                     others += amount
-                
+
                 self.pool.get('hr.payslip.line').write(cr, uid, [line.id], {'total':amount})
-                
+
             record = {
                 'allounce':round(allow),
                 'deduction':round(deduct),
@@ -755,9 +708,9 @@ class hr_payslip(osv.osv):
                 'total_pay':round(rs.basic + allow - deduct)
             }
             res[rs.id] = record
-        
+
         return res
-    
+
     _columns = {
         'deg_id':fields.many2one('hr.payroll.structure', 'Designation', required=False),
         'register_id':fields.many2one('hr.payroll.register', 'Register', required=False),
@@ -786,18 +739,13 @@ class hr_payslip(osv.osv):
         'other_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Others', digits=(16, 2)),
         'total_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Total Payment', digits=(16, 2)),
         'line_ids':fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
-        'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
-        'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
         'holiday_days': fields.integer('No of Leaves', readonly=True),
         'worked_days': fields.integer('Worked Day', readonly=True),
         'working_days': fields.integer('Working Days', readonly=True),
         'paid':fields.boolean('Paid ? ', required=False),
         'note':fields.text('Description'),
         'contract_id':fields.many2one('hr.contract', 'Contract', required=False),
-        
         'igross': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
         'inet': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
     }
@@ -808,7 +756,7 @@ class hr_payslip(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
     }
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         default = {
@@ -823,7 +771,7 @@ class hr_payslip(osv.osv):
         }
         res_id = super(hr_payslip, self).copy(cr, uid, id, default, context)
         return res_id
-    
+
     def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
         slip_move = self.pool.get('hr.payslip.account.move')
         for slip in ids:
@@ -834,541 +782,29 @@ class hr_payslip(osv.osv):
                 'name':name
             }
             slip_move.create(cr, uid, res)
-            
+
     def set_to_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
-    
-    def cancel_sheet(self, cr, uid, ids, context={}):
-        move_pool = self.pool.get('account.move')
 
-        for slip in self.browse(cr, uid, ids, context):
-            if slip.move_id:
-                if slip.move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.move_id.id])
-            
-            if slip.adj_move_id:
-                if slip.adj_move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.adj_move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.adj_move_id.id])
-                
-            if slip.other_move_id:
-                if slip.other_move_id.state == 'posted':
-                    move_pool.button_cancel(cr, uid [slip.other_move_id.id], context)
-                move_pool.unlink(cr, uid, [slip.other_move_id.id])
-            
+    def cancel_sheet(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'cancel'})
         return True
-    
-    def process_sheet(self, cr, uid, ids, context={}):
-        move_pool = self.pool.get('account.move')
-        movel_pool = self.pool.get('account.move.line')
-        invoice_pool = self.pool.get('account.invoice')
-        
-        for slip in self.browse(cr,uid,ids):    
-            line_ids = []
-            partner = False
-            partner_id = False
-            exp_ids = []
-            
-            partner = slip.employee_id.address_home_id.partner_id
-            partner_id = partner.id
-            
-            fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
-            if not fiscal_year_ids:
-                raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-            fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
-            year_exist = False
-            for fiscal_year in fiscal_year_objs:
-                if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
-                    year_exist = True
-            if not year_exist:
-                raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-            search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-            if not search_period:
-                raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-            period_id = search_period[0]
-            name = 'Payment of Salary to %s' % (slip.employee_id.name)
-            move = {
-                'journal_id': slip.bank_journal_id.id,
-                'period_id': period_id, 
-                'date': slip.date,
-                'type':'bank_pay_voucher',
-                'ref':slip.number,
-                'narration': name
-            }
-            move_id = move_pool.create(cr, uid, move)
-            self.create_voucher(cr, uid, [slip.id], name, move_id)
-            
-            name = "To %s account" % (slip.employee_id.name)
-            ded_rec = {
-                'move_id':move_id,
-                'name': name,
-                #'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.property_bank_account.id, 
-                'debit': 0.0,
-                'credit' : slip.total_pay,
-                'journal_id' : slip.journal_id.id,
-                'period_id' :period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, ded_rec)]
-            name = "By %s account" % (slip.employee_id.property_bank_account.name)
-            cre_rec = {
-                'move_id':move_id,
-                'name': name,
-                'partner_id': partner_id,
-                'date': slip.date,
-                'account_id': partner.property_account_payable.id,
-                'debit':  slip.total_pay,
-                'credit' : 0.0,
-                'journal_id' : slip.journal_id.id,
-                'period_id' :period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
-            other_pay = slip.other_pay
-            #Process all Reambuse Entries
-            for line in slip.line_ids:
-                if line.type == 'otherpay' and line.expanse_id.invoice_id:
-                    if not line.expanse_id.invoice_id.move_id:
-                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
-                    invids = [line.expanse_id.invoice_id.id]
-                    amount = line.total
-                    acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
-                    period_id = slip.period_id.id
-                    journal_id = slip.bank_journal_id.id
-                    name = '[%s]-%s' % (slip.number, line.name)
-                    invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
-                    other_pay -= amount
-                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
-                    l_ids = movel_pool.search(cr, uid, [('name','=',name)])
-                    line_ids += l_ids
-                    
-                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)])
-                    exp_ids += l_ids
-            
-            #Process for Other payment if any
-            other_move_id = False
-            if slip.other_pay > 0:
-                narration = 'Payment of Other Payeble amounts to %s' % (slip.employee_id.name)
-                move = {
-                    'journal_id': slip.bank_journal_id.id,
-                    'period_id': period_id, 
-                    'date': slip.date,
-                    'type':'bank_pay_voucher',
-                    'ref':slip.number,
-                    'narration': narration
-                }
-                other_move_id = move_pool.create(cr, uid, move)
-                self.create_voucher(cr, uid, [slip.id], narration, move_id)
-                
-                name = "To %s account" % (slip.employee_id.name)
-                ded_rec = {
-                    'move_id':other_move_id,
-                    'name':name,
-                    'date':slip.date, 
-                    'account_id':slip.employee_id.property_bank_account.id, 
-                    'debit': 0.0,
-                    'credit': other_pay,
-                    'journal_id':slip.journal_id.id,
-                    'period_id':period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                name = "By %s account" % (slip.employee_id.property_bank_account.name)
-                cre_rec = {
-                    'move_id':other_move_id,
-                    'name':name,
-                    'partner_id':partner_id,
-                    'date':slip.date,
-                    'account_id':partner.property_account_payable.id,
-                    'debit': other_pay,
-                    'credit':0.0,
-                    'journal_id':slip.journal_id.id,
-                    'period_id':period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
-            
-            rec = {
-                'state':'done',
-                'move_payment_ids':[(6, 0, line_ids)],
-                'paid':True
-            }
-            self.write(cr, uid, [slip.id], rec)
-            for exp_id in exp_ids:
-                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]})
-                
-        return True
-    
+
     def account_check_sheet(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'accont_check'})
         return True
-    
+
     def hr_check_sheet(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'hr_check'})
         return True
     
+    def process_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'done'})
+        return True
+    
     def verify_sheet(self, cr, uid, ids, context={}):
-        
-        move_pool = self.pool.get('account.move')
-        movel_pool = self.pool.get('account.move.line')
-        exp_pool = self.pool.get('hr.expense.expense')
-        
-        for slip in self.browse(cr,uid,ids):
-            total_deduct = 0.0
-            
-            line_ids = []
-            partner = False
-            partner_id = False
-            
-            if not slip.employee_id.address_home_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Employee Home Address Along with Partners !!'))
-            
-            if not slip.employee_id.address_home_id.partner_id:
-                raise osv.except_osv(_('Integrity Error !'), _('Please defined the Partner in Home Address !!'))
-            
-            partner = slip.employee_id.address_home_id.partner_id
-            partner_id = slip.employee_id.address_home_id.partner_id.id
-            
-            period_id = False
-            
-            if slip.period_id:
-                period_id = slip.period_id.id
-            else:
-                fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
-                if not fiscal_year_ids:
-                    raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
-                fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
-                year_exist = False
-                for fiscal_year in fiscal_year_objs:
-                    if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
-                        year_exist = True
-                if not year_exist:
-                    raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
-                search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
-                if not search_period:
-                    raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
-                period_id = search_period[0]
-            
-            move = {
-                #'name': slip.name, 
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id, 
-                'date': slip.date,
-                'ref':slip.number,
-                'narration': slip.name
-            }
-            move_id = move_pool.create(cr, uid, move)
-            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
-            
-            line = {
-                'move_id':move_id,
-                'name': "By Basic Salary / " + slip.employee_id.name,
-                'date': slip.date,
-                'account_id': slip.employee_id.salary_account.id, 
-                'debit': slip.basic,
-                'credit': 0.0,
-                'quantity':slip.working_days,
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id,
-                'analytic_account_id': False,
-                'ref':slip.number
-            }
-            
-            #Setting Analysis Account for Basic Salary
-            if slip.employee_id.analytic_account:
-                line['analytic_account_id'] = slip.employee_id.analytic_account.id
-            
-            move_line_id = movel_pool.create(cr, uid, line)
-            line_ids += [move_line_id]
-            
-            line = {
-                'move_id':move_id,
-                'name': "To Basic Paysble Salary / " + slip.employee_id.name,
-                'partner_id': partner_id,
-                'date': slip.date, 
-                'account_id': slip.employee_id.employee_account.id, 
-                'debit': 0.0,
-                'quantity':slip.working_days,
-                'credit': slip.basic,
-                'journal_id': slip.journal_id.id,
-                'period_id': period_id,
-                'ref':slip.number
-            }
-            line_ids += [movel_pool.create(cr, uid, line)]
-            
-            for line in slip.line_ids:
-                name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
-                amount = line.total
-                
-                if line.type == 'leaves':
-                    continue
-                
-                rec = {
-                    'move_id':move_id,
-                    'name': name,
-                    'date': slip.date, 
-                    'account_id': line.account_id.id, 
-                    'debit': 0.0,
-                    'credit' : 0.0,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'analytic_account_id':False,
-                    'ref':slip.number,
-                    'quantity':1
-                }
-                
-                #Setting Analysis Account for Salary Slip Lines
-                if line.analytic_account_id:
-                    rec['analytic_account_id'] = line.analytic_account_id.id
-                else: 
-                    rec['analytic_account_id'] = slip.deg_id.account_id.id
-                    
-                if line.type == 'allounce' or line.type == 'otherpay':
-                    rec['debit'] = amount
-                    if not partner.property_account_payable:
-                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
-                    ded_rec = {
-                        'move_id':move_id,
-                        'name': name,
-                        'partner_id': partner_id,
-                        'date': slip.date, 
-                        'account_id': partner.property_account_payable.id, 
-                        'debit': 0.0,
-                        'quantity':1,
-                        'credit' : amount,
-                        'journal_id' : slip.journal_id.id,
-                        'period_id' :period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                elif line.type == 'deduction' or line.type == 'otherdeduct':
-                    if not partner.property_account_receivable:
-                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
-                    rec['credit'] = amount
-                    total_deduct += amount
-                    ded_rec = {
-                        'move_id':move_id,
-                        'name': name,
-                        'partner_id': partner_id,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': partner.property_account_receivable.id, 
-                        'debit': amount,
-                        'credit' : 0.0,
-                        'journal_id' : slip.journal_id.id,
-                        'period_id' :period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                
-                line_ids += [movel_pool.create(cr, uid, rec)]
-                
-                if line.company_contrib > 0:
-                    company_contrib = line.company_contrib
-#                    if line.category_id.amount_type == 'per':
-#                        company_contrib = (amount * line.category_id.contribute_per)
-
-                    narration = """Company Contribution of %s Encode same as a Company Expanse @ %s""" % (line.name, company_contrib)
-                    move = {
-                        #'name': slip.name, 
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id, 
-                        'date': slip.date,
-                        'ref':slip.number,
-                        'narration': narration
-                    }
-                    company_contrib_move_id = move_pool.create(cr, uid, move)
-                    name = "[%s] - %s / %s - Company Contribution" % (line.code, line.name, slip.employee_id.name)
-                    self.create_voucher(cr, uid, [slip.id], name, company_contrib_move_id)
-                    
-                    ded_deb = {
-                        'move_id':company_contrib_move_id,
-                        'name': name,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': line.category_id.account_id.id,
-                        'debit': company_contrib,
-                        'credit' : 0.0,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_deb)]
-                    ded_cre = {
-                        'move_id':company_contrib_move_id,
-                        'name': name,
-                        'date': slip.date, 
-                        'quantity':1,
-                        'account_id': line.category_id.register_id.account_id.id,
-                        'debit': 0.0,
-                        'credit' : company_contrib,
-                        'journal_id': slip.journal_id.id,
-                        'period_id': period_id,
-                        'ref':slip.number
-                    }
-                    line_ids += [movel_pool.create(cr, uid, ded_cre)]
-                    
-                    if line.category_id.include_in_salary:
-                        narration = """Company Contribution of %s Deducted from Employee %s""" % (line.name, company_contrib)
-                        move = {
-                            #'name': slip.name, 
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id, 
-                            'date': slip.date,
-                            'ref':slip.number,
-                            'narration': narration
-                        }
-                        include_in_salary_move_id = move_pool.create(cr, uid, move)
-                        self.create_voucher(cr, uid, [slip.id], narration, include_in_salary_move_id)
-                        
-                        total_deduct += company_contrib
-                        ded_deb = {
-                            'move_id':include_in_salary_move_id,
-                            'name': name,
-                            'partner_id': partner_id,
-                            'date': slip.date, 
-                            'quantity':1,
-                            'account_id': partner.property_account_receivable.id,
-                            'debit': company_contrib,
-                            'credit' : 0.0,
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id,
-                            'ref':slip.number
-                        }
-                        line_ids += [movel_pool.create(cr, uid, ded_deb)]
-                        ded_cre = {
-                            'move_id':include_in_salary_move_id,
-                            'name': name,
-                            'date': slip.date, 
-                            'quantity':1,
-                            'account_id': line.category_id.account_id.id,
-                            'debit': 0.0,
-                            'credit' : company_contrib,
-                            'journal_id': slip.journal_id.id,
-                            'period_id': period_id,
-                            'ref':slip.number
-                        }
-                        line_ids += [movel_pool.create(cr, uid, ded_cre)]
-
-                #make an entry line to contribution register
-                if line.category_id.register_id:
-                    ctr = {
-                        'register_id':line.category_id.register_id.id,
-                        'name':line.name,
-                        'code':line.code,
-                        'employee_id':slip.employee_id.id,
-                        'period_id':period_id,
-                        'emp_deduction':amount,
-                    }
-                    if line.category_id.contribute:
-                        ctr['comp_deduction'] = amount
-                    
-                    company = 0.0
-                    employee = 0.0
-                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
-                        company = new_amount
-                        employee = amount - company
-                    
-                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-                        company = line.category_id.contribute_per
-                        employee = amount - company
-
-                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-                        employee = amount
-                    
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
-                        company = amount * line.category_id.contribute_per
-                        employee = amount
-                    
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
-                        company = line.category_id.contribute_per
-                        employee = amount
-
-                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
-                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
-                        employee = amount
-                        
-                    ctr['emp_deduction'] = employee
-                    ctr['comp_deduction'] = company
-                        
-                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
-            
-            adj_move_id = False
-            if total_deduct > 0:
-                move = {
-                    'journal_id': slip.journal_id.id,
-                    'period_id': period_id,
-                    'date': slip.date,
-                    'ref':slip.number,
-                    'narration': 'Adjustment : %s' % (slip.name)
-                }
-                adj_move_id = move_pool.create(cr, uid, move)
-                name = "Adjustment Entry - %s" % (slip.employee_id.name)
-                self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
-                
-                ded_rec = {
-                    'move_id':adj_move_id,
-                    'name': name,
-                    'partner_id': partner_id,
-                    'date': slip.date, 
-                    'account_id': partner.property_account_receivable.id, 
-                    'debit': 0.0,
-                    'quantity':1,
-                    'credit' : total_deduct,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, ded_rec)]
-                cre_rec = {
-                    'move_id':adj_move_id,
-                    'name': name,
-                    'partner_id': partner_id,
-                    'date': slip.date,
-                    'account_id': partner.property_account_payable.id, 
-                    'debit': total_deduct,
-                    'quantity':1,
-                    'credit' : 0.0,
-                    'journal_id' : slip.journal_id.id,
-                    'period_id' :period_id,
-                    'ref':slip.number
-                }
-                line_ids += [movel_pool.create(cr, uid, cre_rec)]
-
-            rec = {
-                'state':'confirm',
-                'move_line_ids':[(6, 0,line_ids)],
-            }
-            if not slip.period_id:
-                rec['period_id'] = period_id
-            
-            dates = prev_bounds(slip.date)
-            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')])
-            if exp_ids:
-                acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
-                for exp in exp_pool.browse(cr, uid, exp_ids):
-                    exp_res = {
-                        'name':exp.name,
-                        'amount_type':'fix',
-                        'type':'otherpay',
-                        'category_id':exp.category_id.id,
-                        'amount':exp.amount,
-                        'slip_id':slip.id,
-                        'expanse_id':exp.id,
-                        'account_id':acc
-                    }
-                    self.pool.get('hr.payslip.line').create(cr, uid, exp_res)
-            
-            self.write(cr, uid, [slip.id], rec)
-            
+        self.write(cr, uid, ids, {'state':'confirm'})
         return True
     
     def get_contract(self, cr, uid, employee, date, context={}):
@@ -1386,46 +822,48 @@ class hr_payslip(osv.osv):
             '''
         cr.execute(sql_req, (employee.id, date, date))
         contract = cr.dictfetchone()
-        
+
+        contract = contract and contract or {}
+
         return contract
-    
+
     def _get_leaves(self, cr, user, slip, employee, context={}):
         """
         Compute leaves for an employee
-        
+
         @param cr: cursor to database
         @param user: id of current user
         @param slip: object of the hr.payroll.slip model
         @param employee: object of the hr.employee model
         @param context: context arguments, like lang, time zone
-        
+
         @return: return a result
         """
-        
+
         result = []
 
         dates = prev_bounds(slip.date)
         sql = '''select id from hr_holidays
-                    where date_from >= '%s' and date_to <= '%s' 
-                    and employee_id = %s 
+                    where date_from >= '%s' and date_to <= '%s'
+                    and employee_id = %s
                     and state = 'validate' ''' % (dates[0], dates[1], slip.employee_id.id)
         cr.execute(sql)
         res = cr.fetchall()
 
         if res:
             result = [x[0] for x in res]
-        
+
         return result
-        
+
     def compute_sheet(self, cr, uid, ids, context={}):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
         func_pool = self.pool.get('hr.payroll.structure')
         slip_line_pool = self.pool.get('hr.payslip.line')
         holiday_pool = self.pool.get('hr.holidays')
-        
+
         date = self.read(cr, uid, ids, ['date'])[0]['date']
-        
+
         #Check for the Holidays
         def get_days(start, end, month, year, calc_day):
             count = 0
@@ -1434,41 +872,41 @@ class hr_payslip(osv.osv):
                 if datetime.date(year, month, day).weekday() == calc_day:
                     count += 1
             return count
-        
+
         for slip in self.browse(cr, uid, ids):
             contracts = self.get_contract(cr, uid, slip.employee_id, date, context)
-            
+
             if contracts.get('id', False) == False:
                 continue
-            
+
             contract = self.pool.get('hr.contract').browse(cr, uid, contracts.get('id'))
             sal_type = contract.wage_type_id.type
             function = contract.struct_id.id
-            
+
             lines = []
             if function:
                 func = func_pool.read(cr, uid, function, ['line_ids'])
                 lines = slip_line_pool.browse(cr, uid, func['line_ids'])
-            
+
             lines += slip.employee_id.line_ids
-            
+
             old_slip_id = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)])
             slip_line_pool.unlink(cr, uid, old_slip_id)
-            
+
             ad = []
             lns = {}
             all_per = 0.0
             ded_per = 0.0
             all_fix = 0.0
             ded_fix = 0.0
-            
+
             obj = {
                 'basic':0.0
             }
             update = {
-            
+
             }
-            
+
             if contract.wage_type_id.type == 'gross':
                 obj['gross'] = contract.wage
                 update['igross'] = contract.wage
@@ -1478,23 +916,23 @@ class hr_payslip(osv.osv):
             if contract.wage_type_id.type == 'basic':
                 obj['basic'] = contract.wage
                 update['basic'] = contract.wage
-            
+
             c_type = {
-            
+
             }
 
             for line in lines:
                 cd = line.code.lower()
                 obj[cd] = line.amount or 0.0
-            
+
             for line in lines:
-            
+
                 if line.category_id.code in ad:
                     continue
-                    
+
                 ad.append(line.category_id.code)
                 cd = line.category_id.code.lower()
-                
+
                 calculate = False
                 try:
                     exp = line.category_id.condition
@@ -1504,60 +942,61 @@ class hr_payslip(osv.osv):
 
                 if not calculate:
                     continue
-                
+
                 percent = 0.0
                 value = 0.0
                 base = False
                 company_contrib = 0.0
                 base = line.category_id.base
-                
+
                 try:
                     # Please have a look at the configuration guide for rules and restrictions
                     amt = eval(base, obj)
                 except Exception, e:
                     raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
-                
+
                 if sal_type in ('gross', 'net'):
                     if line.amount_type == 'per':
                         percent = line.amount
-                        
+
                         if amt > 1:
                             value = percent * amt
                         elif amt > 0 and amt <= 1:
                             percent = percent * amt
-                        
+
                         if value > 0:
                             percent = 0.0
-                    
+
                     elif line.amount_type == 'fix':
                         value = line.amount
-                    
+
                     elif line.amount_type == 'func':
                         value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
                 else:
                     if line.amount_type in ('fix', 'per'):
                         value = line.amount
+                    
                     elif line.amount_type == 'func':
                         value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
-                
+
                 if line.type == 'allowance':
                     all_per += percent
                     all_fix += value
                 elif line.type == 'deduction':
                     ded_per += percent
                     ded_fix += value
-                
+
                 vals = {
-                    'amount':line.amount, 
-                    'slip_id':slip.id, 
-                    'employee_id':False, 
+                    'amount':line.amount,
+                    'slip_id':slip.id,
+                    'employee_id':False,
                     'function_id':False,
                     'base':base
                 }
                 slip_line_pool.copy(cr, uid, line.id, vals, {})
-
+            
             if sal_type in ('gross', 'net'):
                 sal = contract.wage
                 if sal_type == 'net':
@@ -1574,42 +1013,45 @@ class hr_payslip(osv.osv):
                 basic = (sal * 100) / final
             else:
                 basic = contract.wage
-            
+
             number = self.pool.get('ir.sequence').get(cr, uid, 'salary.slip')
             ttyme = datetime.fromtimestamp(time.mktime(time.strptime(slip.date,"%Y-%m-%d")))
             update.update({
                 'deg_id':function,
-                'number':number, 
+                'number':number,
                 'basic': round(basic),
                 'basic_before_leaves': round(basic),
-                'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')), 
+                'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
                 'state':'draft',
                 'contract_id':contract.id,
                 'company_id':slip.employee_id.company_id.id
             })
             self.write(cr, uid, [slip.id], update)
-        
-        
+
         for slip in self.browse(cr, uid, ids):
-            basic_before_leaves = basic
+
+            if not slip.contract_id :
+                continue
+
+            basic_before_leaves = slip.basic
 
             working_day = 0
             off_days = 0
             dates = prev_bounds(slip.date)
-            
+
             days_arr = [0, 1, 2, 3, 4, 5, 6]
             for dy in range(contract.working_days_per_week, 7):
                 off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
-        
+
             total_off = off_days
             working_day = dates[1].day - total_off
             perday = slip.net / working_day
-            
+
             total = 0.0
             leave = 0.0
-            
+
             leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
-            
+
             total_leave = 0.0
             paid_leave = 0.0
             for hday in holiday_pool.browse(cr, uid, leave_ids):
@@ -1622,16 +1064,16 @@ class hr_payslip(osv.osv):
                     'account_id':hday.holiday_status_id.account_id.id,
                     'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
                 }
-                
+
                 days = hday.number_of_days
                 if hday.number_of_days < 0:
                     days = hday.number_of_days * -1
-                
+
                 total_leave += days
                 if hday.holiday_status_id.type == 'paid':
                     paid_leave += days
                     continue
-                    
+
                 elif hday.holiday_status_id.type == 'halfpaid':
                     paid_leave += (days / 2)
                     res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
@@ -1645,7 +1087,7 @@ class hr_payslip(osv.osv):
                     res['type'] = 'deduction'
                     leave += days
                     total += perday * days
-                
+
                 slip_line_pool.create(cr, uid, res)
             basic = basic - total
             leaves = total
@@ -1658,9 +1100,9 @@ class hr_payslip(osv.osv):
                 'working_days':working_day,
             })
             self.write(cr, uid, [slip.id], update)
-            
+
         return True
-        
+
 hr_payslip()
 
 class account_move_link_slip(osv.osv):
@@ -1683,7 +1125,7 @@ class line_condition(osv.osv):
     '''
     _name = 'hr.payslip.line.condition'
     _description = 'Line Condition'
-    
+
     _columns = {
         'name':fields.char('Name', size=64, required=False, readonly=False),
         'date_start': fields.date('Start Date'),
@@ -1701,14 +1143,14 @@ class hr_payslip_line(osv.osv):
     '''
     _name = 'hr.payslip.line'
     _description = 'Payslip Line'
-    
+
 #    def _calculate(self, cr, uid, ids, field_names, arg, context):
 #        res = {}
 #        obj = {}
 #        for line in self.browse(cr, uid, ids, context):
 #            obj['basic'] = line.slip_id.basic
 #            amount = 0.0
-#            
+#
 #            if line.amount_type == 'per' and line.base:
 #                print 'XXXXXXXXXXXXXXXX : ', obj
 #                amount = line.amount * eval(line.base, obj)
@@ -1718,7 +1160,7 @@ class hr_payslip_line(osv.osv):
 #            cd = line.category_id.code.lower()
 #            obj[cd] = amount
 #            print 'XXXXXXXXXXXXXXXXXX : ', cd
-#            
+#
 #            res[line.id] = amount
 #        print 'XXXXXXXXXXXX : ', obj
 #        return res
@@ -1736,14 +1178,14 @@ class hr_payslip_line(osv.osv):
                 'type':category.type
             })
         return {'value':res}
-    
+
     def onchange_amount(self, cr, uid, ids, amount, typ):
         amt = amount
         if typ and typ == 'per':
             if int(amt) > 0:
                 amt = amt / 100
         return {'value':{'amount':amt}}
-    
+
     _columns = {
         'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
         'condition_id':fields.many2one('hr.payslip.line.condition', 'Condition', required=False),
@@ -1771,30 +1213,30 @@ class hr_payslip_line(osv.osv):
         'amount': fields.float('Amount / Percentage', digits=(16, 4)),
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'account_id':fields.many2one('account.account', 'General Account', required=True),
-        'total': fields.float('Sub Total', readonly=True, digits=(16, int(config['price_accuracy']))),
+        'total': fields.float('Sub Total', readonly=True, digits=(16, 4)),
         #'total': fields.function(_calculate, method=True, type='float', string='Label', store=True),
-        'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, int(config['price_accuracy']))),
+        'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, 4)),
         'expanse_id': fields.many2one('hr.expense.expense', 'Expense'),
         'sequence': fields.integer('Sequence'),
         'note':fields.text('Description'),
         'line_ids':fields.one2many('hr.payslip.line.line', 'slipline_id', 'Calculations', required=False)
     }
     _order = 'sequence'
-    
+
     def execute_function(self, cr, uid, id, value, context):
         line_pool = self.pool.get('hr.payslip.line.line')
         res = 0
         ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value), ('to_val','>=',value)])
-        
+
         if not ids:
             ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value)])
-        
+
         if not ids:
             return res
-        
+
         res = line_pool.browse(cr, uid, ids)[-1].value
         return res
-        
+
 hr_payslip_line()
 
 class hr_payslip_line_line(osv.osv):
@@ -1804,18 +1246,18 @@ class hr_payslip_line_line(osv.osv):
     _name = 'hr.payslip.line.line'
     _description = 'Function Line'
     _order = 'sequence'
-    
+
     _columns = {
         'slipline_id':fields.many2one('hr.payslip.line', 'Slip Line', required=False),
         'name':fields.char('Name', size=64, required=False, readonly=False),
         'umo_id':fields.many2one('product.uom', 'Unite', required=False),
-        'from_val': fields.float('From', digits=(16, int(config['price_accuracy']))),
-        'to_val': fields.float('To', digits=(16, int(config['price_accuracy']))),
+        'from_val': fields.float('From', digits=(16, 4)),
+        'to_val': fields.float('To', digits=(16, 4)),
         'amount_type':fields.selection([
             ('fix','Fixed Amount'),
         ],'Amount Type', select=True),
         'sequence':fields.integer('Sequence'),
-        'value': fields.float('Value', digits=(16, int(config['price_accuracy']))),
+        'value': fields.float('Value', digits=(16, 4)),
     }
 hr_payslip_line_line()
 
@@ -1825,7 +1267,7 @@ class hr_employee(osv.osv):
     '''
     _inherit = 'hr.employee'
     _description = 'Employee'
-    
+
     _columns = {
         'pan_no':fields.char('PAN No', size=64, required=False, readonly=False),
         'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False),
@@ -1835,6 +1277,7 @@ class hr_employee(osv.osv):
         'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
         'otherid':fields.char('Other Id', size=64, required=False),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', required=False, readonly=False),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'property_bank_account': fields.property(
@@ -1876,3 +1319,4 @@ class hr_employee(osv.osv):
     }
 hr_employee()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
new file mode 100644
index 00000000000..2d77c1d820e
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Payroll Structure -->
+        <record id="structure_001" model="hr.payroll.structure">
+            <field name="code">ME</field>
+            <field name="name">Marketing Executive</field>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+        <record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
+            <field name="amount_type">per</field>
+            <field name="account_id" ref="account.a_expense"/>
+            <field eval="5" name="sequence"/>
+            <field eval="0.4" name="amount"/>
+            <field name="code">HRA</field>
+            <field name="category_id" ref="hr_payroll.HRA"/>
+            <field name="type">allowance</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">House Rant Allowance</field>
+        </record>
+        <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
+            <field name="amount_type">fix</field>
+            <field name="account_id" ref="account.a_expense"/>
+            <field eval="10" name="sequence"/>
+            <field eval="800.0" name="amount"/>
+            <field name="code">CA</field>
+            <field name="category_id" ref="hr_payroll.CA"/>
+            <field name="type">allowance</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Convance Allowance</field>
+        </record>
+        <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
+            <field name="amount_type">fix</field>
+            <field name="account_id" ref="account.a_pay"/>
+            <field eval="15" name="sequence"/>
+            <field eval="200.0" name="amount"/>
+            <field name="code">PT</field>
+            <field name="category_id" ref="hr_payroll.PT"/>
+            <field name="type">deduction</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Professional Tax</field>
+        </record>
+        <record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
+            <field name="amount_type">per</field>
+            <field name="account_id" ref="account.a_pay"/>
+            <field eval="20" name="sequence"/>
+            <field eval="0.125" name="amount"/>
+            <field name="code">PF</field>
+            <field name="category_id" ref="hr_payroll.PF"/>
+            <field name="type">deduction</field>
+            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <field name="name">Provident Fund</field>
+        </record>
+        
+        <!-- Employee -->
+        <record id="hr_employee_bonamy0" model="hr.employee">
+            <field eval="0" name="manager"/>
+            <field eval="1.0" name="time_efficiency"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="1" name="active"/>
+            <field name="name">Bonamy</field>
+            <field name="resource_type">user</field>
+        </record>
+        
+        <!-- Employee Contract -->
+        <record id="hr_contract_firstcontract1" model="hr.contract">
+            <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
+            <field name="name">First Contract</field>
+            <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+            <field name="struct_id" ref="hr_payroll.structure_001"/>
+            <field name="employee_id" ref="hr_employee_bonamy0"/>
+            <field name="notes">This is a First Contract</field>
+            <field eval="4000.0" name="wage"/>
+            <field eval="5" name="working_days_per_week"/>
+        </record>
+        
+        <!-- Payslip -->
+        <record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
+            <field name="number">SLIP/001</field>
+            <field name="journal_id" ref="account.expenses_journal"/>
+            <field name="deg_id" ref="hr_payroll.structure_001"/>
+            <field name="employee_id" ref="hr_employee_bonamy0"/>
+            <field name="contract_id" ref="hr_contract_firstcontract1"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
+            <field name="bank_journal_id" ref="account.bank_journal"/>
+            <field name="name">Salary Slip of Bonamy for June-2010</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0be3793a234..c8810e52c68 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -4,6 +4,8 @@
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll"/>
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
+        <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
+
         
         <!-- Passport Views    -->
         <record id="hr_passport_form" model="ir.ui.view">
@@ -14,7 +16,7 @@
                 <form string="Passport">
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
-                        <field name="employee_id" select="1"/>
+                        <field name="employee_id" />
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Country &amp; Address" colspan="4"/>
@@ -38,25 +40,51 @@
                 </form>
             </field>
         </record>
-         <record id="hr_passport_tree" model="ir.ui.view">
+        <record id="hr_passport_tree" model="ir.ui.view">
             <field name="name">hr.passport.tree</field>
             <field name="model">hr.passport</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Passport">
-                    <field name="name" select="1"/>
-                    <field name="employee_id" select="1"/>
-                    <field name="country_id" select="1"/>
-                    <field name="date_expire" select="1"/>
-                    <field name="date_expire" select="1"/>
+                    <field name="name" />
+                    <field name="employee_id" />
+                    <field name="address_id"/>
+                    <field name="country_id" />
+                    <field name="date_expire"/>
+                    <field name="date_issue" />
                 </tree>
             </field>
         </record>
+
+        <record id="view_hr_passport_filter" model="ir.ui.view">
+            <field name="name">hr.passport.select</field>
+            <field name="model">hr.passport</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Passport">
+                    <group col="8" colspan="4">
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="employee_id"/>
+                        <field name="country_id"/>
+                        <field name="address_id"/>
+                    </group>
+                    <newline/>
+                    <group col="8" colspan="4" expand="0" string="Group By...">
+                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
+                        <filter string="Country" name="country_id" icon="terp-go-home" context="{'group_by':'country_id'}"/>
+                        <filter string="Expire" name="date_expire" icon="terp-go-month" context="{'group_by':'date_expire'}"/>
+                        <filter string="Issue" name="date_issue" icon="terp-go-month" context="{'group_by':'date_issue'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>           
         <record id="action_hr_passport_tree" model="ir.actions.act_window">
             <field name="name">All Passports</field>
             <field name="res_model">hr.passport</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_passport_tree"/>
+            <field name="search_view_id" ref="view_hr_passport_filter"/>
         </record>
         <menuitem id="passport_configure" parent="hr.menu_hr_configuration" name="Passport"/>
         <menuitem
@@ -131,7 +159,8 @@
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
                             <field name="pan_no" select="1"/>
-                            <field name="bank_account"/>
+<!--                            <field name="bank_account"/>-->
+                            <field name="bank_account_id"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                         </group>
@@ -140,7 +169,6 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="ESI Information"/>
@@ -458,58 +486,64 @@
                             </group>
                         </page>
                         <page string="Accounting Details">
-                            <group col="2" colspan="3">
-                                <separator colspan="4" string="Accounting Informations"/>
-                                <field name="move_ids" colspan="2" nolabel="1" readonly="1">
-                                    <tree string="Accounting Vouchers">
-                                        <field name="sequence"/>
-                                        <field name="name"/>
-                                        <field name="move_id"/>
-                                    </tree>
-                                    <form string="Accounting Vouchers">
-                                        <field name="sequence"/>
-                                        <field name="name"/>
-                                        <field name="move_id"/>
-                                    </form>
-                                </field>
-                            </group>
                             <group col="2" colspan="1">
-                                <separator colspan="4" string="Other Informations"/>
+                                <separator colspan="2" string="Other Informations"/>
                                 <field name="paid" readonly="1"/>
                                 <field name="company_id"/>
                                 <field name="register_id"/>
                                 <field name="deg_id"/>
                                 <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
                             </group>
+                            <newline/>
                             <separator colspan="4" string="Description"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Account Lines">
-                            <field name="move_line_ids" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Payment Lines">
-                            <field name="move_payment_ids" colspan="4" nolabel="1"/>
-                        </page>
                     </notebook>
-                    <group col="9" colspan="4">
+                    <group col="10" colspan="4">
                         <field name="state"/>
-                        <button string="Compute Sheet" name="compute_sheet" states="new"/>
-                        <button string="Recompute Sheet" name="compute_sheet" type="object" states="draft"/>
-                        <button string="Verify Sheet" name="verify_sheet" states="draft"/>
-                        <button string="Complete HR Checking" name="verify_twice_sheet" states="hr_check"/>
-                        <button string="Complete Accountant Checking" name="final_verify_sheet" states="accont_check"/>
-                        <button string="Pay Salary" name="process_sheet" states="confirm"/>
-                        <button string="Cancel" name="cancel_sheet" states="draft,hr_check,accont_check,confirm"/>
-                        <button string="Set to Draft" name="set_to_draft" states="cancel"/>
+                        <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" states="new"/>
+                        <button string="Recompute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
+                        <button string="Verify Sheet" icon="terp-camera_test" name="verify_sheet" states="draft"/>
+                        <button string="Complete HR Checking" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
+                        <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
+                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
+                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
                     </group>
                 </form>
             </field>
         </record>
+        <record id="view_hr_payslip_filter" model="ir.ui.view">
+            <field name="name">hr.payslip.select</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Payslips">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-account" string="Paid" domain="[('state','=','done'),('paid','=',True)]" help="Paid Slip"/>
+                        <field name="name"/>
+                        <field name="employee_id"/>
+                        <field name="number"/>
+                        <field name="date"/>
+                    </group>
+                    <newline/>
+                    <group col="8" colspan="4" expand="0" string="Group By...">
+                        <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'register_id':self}"/>
+                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'employee_id':self}"/>
+                        <filter string="Periods" name="period_id" icon="terp-go-month" context="{'period_id':self}"/>
+                        <filter string="Staes" name="state" icon="terp-stock_effects-object-colorize" context="{'state':self}"/>
+                    </group>
+                </search>
+            </field>
+        </record>   
         <record id="action_view_hr_payslip_form" model="ir.actions.act_window">
             <field name="name">Employee Payslip</field>
             <field name="res_model">hr.payslip</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_hr_payslip_tree"/>
+            <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
         
@@ -527,8 +561,11 @@
                         <field name="code" select="1"/>
                         <field name="type" select="1"/>
                         <group col="2" colspan="4">
+                            <separator colspan="4" string="Based on"/>
+                            <field name="base" colspan="4" nolabel="1"/>
+                        </group>
+                        <group col="2" colspan="2">
                             <separator colspan="4" string="Dynamic Computation"/>
-                            <field name="base"/>
                             <field name="condition"/>
                             <field name="sequence"/>
                         </group>
@@ -537,6 +574,9 @@
                         <page string="Description">
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
+                        <page string="Contribution">
+                            <field name="contribute_ids" colspan="4" nolabel="1" height="300"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -556,11 +596,34 @@
                 </tree>
             </field>
         </record>
+
+        <record id="view_allounce_deduction_categoty_filter" model="ir.ui.view">
+            <field name="name">hr.allounce.deduction.categoty.select</field>
+            <field name="model">hr.allounce.deduction.categoty</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Salary Heads">
+                    <filter icon="terp-document-new" string="Allowance" domain="[('type','=','allowance')]"/>
+                    <filter icon="terp-check" string="Deduction" domain="[('type','=','deduction')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                   	<field name="code" select="1"/>
+                    <field name="type"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                        <filter string="Based" icon="terp-go-month" domain="[]" context="{'group_by':'base'}"/>
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
         <record id="hr_allounce_deduction_tree" model="ir.actions.act_window">
             <field name="name">Salary Heads</field>
             <field name="res_model">hr.allounce.deduction.categoty</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_allounce_deduction_categoty_tree"/>
+           <field name="search_view_id" ref="view_allounce_deduction_categoty_filter"/>
         </record>
         <menuitem 
             id="menu_hr_allounce_deduction_tree" 
@@ -625,14 +688,40 @@
                     <field name="contribute_per"/>
                     <field name="amount_type"/>
                     <field name="register_id"/>
+                     <field name="category_id"/>
                 </tree>
             </field>
         </record>
+
+		<record id="view_hr_company_contribution_filter" model="ir.ui.view">
+            <field name="name">company.contribution.select</field>
+             <field name="model">company.contribution</field>
+            <field name="type">search</field>
+          	 <field name="arch" type="xml">
+                <search string="Search Company Contribution">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-document-new" string="Fixed Amount" domain="[('amount_type','=','fix')]" help="Draft Slip"/>
+                        <filter icon="terp-camera_test" string="Function Calculation" domain="[('amount_type','=','func')]" help="Posted Slip"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="contribute_per"/>
+                        <field name="register_id"/>
+                    </group>
+                    <newline/>
+                    <group col="8" colspan="4" expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-partner" name="amount_type" context="{'group_by':'amount_type'}"/>
+                        <filter string="Category" name="category_id" icon="terp-go-month"  context="{'group_by':'category_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>        
         <record id="action_hr_company_contribution_tree" model="ir.actions.act_window">
             <field name="name">Company Contributions</field>
             <field name="res_model">company.contribution</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_company_contribution_tree"/>
+           	<field name="search_view_id" ref="view_hr_company_contribution_filter"/>
         </record>
         <menuitem 
             id="menu_hr_company_contribution_tree" 
@@ -736,9 +825,9 @@
                     </notebook>
                     <group col="6" colspan="6">
                         <field name="state"/>
-                        <button name="confirm_sheet" string="Confirm Sheet" states="draft" type="object"/>
-                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" type="object"/>
+                        <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
+                        <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                     </group>
                 </form>
             </field>
@@ -815,13 +904,12 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state"/>
-                        <button string="Compute" name="compute_sheet" states="new" type="object"/>
-                        <button string="Verify Sheet" name="verify_sheet" states="draft" type="object"/>
-                        <button string="Complete HR Checking" name="verify_twice_sheet" type="object" states="hr_check"/>
-                        <button string="Complete Accountant Checking" name="final_verify_sheet" states="accont_check" type="object"/>
-                        <button string="Pay Salary" name="process_sheet" states="confirm" type="object"/>
-                        <button string="Cancel" name="cancel_sheet" states="draft,hr_check,accont_check,confirm" type="object"/>
-                        <button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
+                        <button string="Compute" name="compute_sheet" states="new" icon="terp-document-new" type="object"/>
+                        <button string="Verify Sheet" icon="gtk-ok" name="verify_sheet" states="draft" type="object"/>
+                        <button string="Complete HR Checking"  icon="gtk-apply" name="final_verify_sheet" type="object" states="hr_check"/>
+                        <button string="Pay Salary" icon="gtk-apply"  name="process_sheet" states="confirm" type="object" />
+                        <button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
+                        <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" />
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_wizard.xml b/addons/hr_payroll/hr_payroll_wizard.xml
index acc1646a8b5..fe0264257e3 100644
--- a/addons/hr_payroll/hr_payroll_wizard.xml
+++ b/addons/hr_payroll/hr_payroll_wizard.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
         <wizard id="wizard_print_year_salary"
             menu="False" 
             model="hr.payslip" 
             name="wizard.year.salary" 
-            string="Year Salary Detail"/>
+            string="Salary Register"/>
         <menuitem  id="menu_wizard_print_year_salary"
             icon="STOCK_PRINT"
             action="wizard_print_year_salary"  
             parent="menu_hr_payroll_reporting" 
-            name="Employee Year Salary"
+            name="Salary Register"
             type="wizard"/>
 
         <wizard id="wizard_print_employees_detail"
             menu="False" 
             model="hr.payslip" 
             name="wizard.employees.detail" 
-            string="Employees Salary Detail"/>
+            string="Employee Salary Statement"/>
         <menuitem  id="menu_wizard_print_employees_detail" 
             icon="STOCK_PRINT"
             action="wizard_print_employees_detail" 
             parent="menu_hr_payroll_reporting" 
-            name="Employees Salary Detail"
+            name="Employee Salary Statement"
             type="wizard"/>
 
-        <wizard id="wizard_payroll_analysis"
-            menu="False" 
-            model="account.analytic.account" 
-            name="payroll.analysis" 
-            string="Create Analytic Structure"/>
-        <menuitem  id="menu_wizard_payroll_analysis" 
-            action="wizard_payroll_analysis" 
-            parent="payroll_configure" 
-            name="Create Analytic Structure"
-            type="wizard"/>
-	</data>
+<!--        <wizard id="wizard_payroll_analysis"-->
+<!--            menu="False" -->
+<!--            model="account.analytic.account" -->
+<!--            name="payroll.analysis" -->
+<!--            string="Create Analytic Structure"/>-->
+<!--        <menuitem  id="menu_wizard_payroll_analysis" -->
+<!--            action="wizard_payroll_analysis" -->
+<!--            parent="payroll_configure" -->
+<!--            name="Create Analytic Structure"-->
+<!--            type="wizard"/>-->
+    </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_workflow.xml b/addons/hr_payroll/hr_payroll_workflow.xml
index 0e5ccfe091f..b607205f54b 100644
--- a/addons/hr_payroll/hr_payroll_workflow.xml
+++ b/addons/hr_payroll/hr_payroll_workflow.xml
@@ -28,13 +28,6 @@
             <field name="kind">function</field>
         </record>
         
-        <record id="act_account_check" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">account_check</field>
-            <field name="action">account_check_sheet()</field>
-            <field name="kind">function</field>
-        </record>
-        
         <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm</field>
@@ -66,30 +59,16 @@
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_hr_check"/>
-            <field name="condition">basic&gt;=10000</field>
             <field name="signal">verify_sheet</field>
         </record>
         
         <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_hr_check"/>
-            <field name="act_to" ref="act_account_check"/>
-            <field name="signal">verify_twice_sheet</field>
-        </record>
-        
-        <record id="t4" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_account_check"/>
-            <field name="condition">basic&lt;10000</field>
-            <field name="signal">verify_sheet</field>
-        </record>
-        
-        <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">final_verify_sheet</field>
         </record>
         
-         <record id="t6" model="workflow.transition">
+        <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">process_sheet</field>
@@ -108,12 +87,6 @@
         </record>
         
         <record id="t9" model="workflow.transition">
-            <field name="act_from" ref="act_account_check"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_sheet</field>
-        </record>
-        
-        <record id="t10" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel_sheet</field>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 01dd4302d37..8d0b1333dfe 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -3,7 +3,7 @@
 
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -28,7 +28,7 @@ from report import report_sxw
 from tools import amount_to_text_en
 
 class salary_structure_report(report_sxw.rml_parse):
-      
+
     def __init__(self, cr, uid, name, context):
           super(salary_structure_report, self).__init__(cr, uid, name, context)
           self.localcontext.update({
@@ -38,7 +38,7 @@ class salary_structure_report(report_sxw.rml_parse):
             'get_line_amount_type':self.get_line_amount_type,
             'get_line_type':self.get_line_type
           })
-          
+
     def get_contract(self,emp):
         curr_date = "'"+time.strftime("%Y-%m-%d")+"'"
         sql_req= '''
@@ -59,16 +59,16 @@ class salary_structure_report(report_sxw.rml_parse):
             return []
         contract = self.pool.get('hr.contract').browse(self.cr, self.uid, [contract_id['id']])
         return contract
-    
+
     def get_type(self,type):
         return type[0].swapcase() + type[1:] +' Salary'
-    
+
     def get_line_amount_type(self,amount_type):
         if amount_type == 'per':
             return 'Percent(%)'
         else:
             return 'Fixed'
-        
+
     def get_line_type(self,type):
         if type == 'allounce':
             return 'Allowance'
@@ -83,8 +83,7 @@ class salary_structure_report(report_sxw.rml_parse):
         else:
             return 'Other Deduction'
 
-report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/report/report_emp_salary_structure.rml', parser=salary_structure_report)   
-
+report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/report/report_emp_salary_structure.rml', parser=salary_structure_report)
 
 
 
@@ -93,6 +92,7 @@ report_sxw.report_sxw('report.salary.structure', 'hr.employee', 'hr_payroll/repo
 
 
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
 
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index c809696a35b..ca06af969e7 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -9,7 +9,7 @@ import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class employees_salary_report(rml_parse.rml_parse):
-    
+
     def __init__(self, cr, uid, name, context):
         super(employees_salary_report, self).__init__(cr, uid, name, context)
         self.localcontext.update({
@@ -25,7 +25,7 @@ class employees_salary_report(rml_parse.rml_parse):
             'get_other':self.get_other,
             'get_monthly_total':self.get_monthly_total,
         })
-        
+
         self.mnths =[]
         self.allow_list =[]
         self.deduct_list = []
@@ -34,17 +34,17 @@ class employees_salary_report(rml_parse.rml_parse):
         self.curr_fiscal_year_name=''
         self.period_ids = []
         self.total=0.00
-    
+
     def get_periods(self,form):
         self.mnths =[]
         fiscalyear = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
         curr_fiscalyear_id = form['fiscalyear_id']
         curr_fiscalyear = fiscalyear.read(self.cr,self.uid,[form['fiscalyear_id']],['date_start','date_stop'])[0]
-        
+
 #       Get start year-month-date and end year-month-date
-        fy = int(curr_fiscalyear['date_start'][0:4])    
+        fy = int(curr_fiscalyear['date_start'][0:4])
         ly = int(curr_fiscalyear['date_stop'][0:4])
-        
+
         fm = int(curr_fiscalyear['date_start'][5:7])
         lm = int(curr_fiscalyear['date_stop'][5:7])
         no_months = (ly-fy)*12+lm-fm + 1
@@ -56,7 +56,7 @@ class employees_salary_report(rml_parse.rml_parse):
         for count in range(0,no_months):
             m = datetime.date(cy, cm, 1).strftime('%b')
             mnth_name.append(m)
-            self.mnths.append(str(cm)+'-'+str(cy))     
+            self.mnths.append(str(cm)+'-'+str(cy))
             if cm == 12:
                 cm = 0
                 cy = ly
@@ -68,10 +68,10 @@ class employees_salary_report(rml_parse.rml_parse):
         return fiscalyear_obj.read(self.cr,self.uid,[fiscalyear_id],['name'])[0]['name']
 
     def get_employee(self,form):
-        result = []   
-        periods = []    
-        emp = pooler.get_pool(self.cr.dbname).get('hr.employee')     
-        emp_ids = form['employee_ids'][0][2]
+        result = []
+        periods = []
+        emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
+        emp_ids = form['employee_ids']
         result = emp.browse(self.cr,self.uid, emp_ids)
         fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
         period_ids_l = fiscalyear_obj.period_ids
@@ -79,7 +79,7 @@ class employees_salary_report(rml_parse.rml_parse):
             periods.append(period.id)
         self.period_ids = ','.join(map(str, periods))
         return result
-    
+
     def get_employee_detail(self,obj):
         self.month_total_list =['Net Total (Allowances with Basic - Deductions)',0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00,0.00]
         self.allow_list =[]
@@ -88,7 +88,7 @@ class employees_salary_report(rml_parse.rml_parse):
         allowance_cat_ids =[]
         deduction_cat_ids = []
         other_cat_ids =[]
-        self.total = 0.00        
+        self.total = 0.00
         payment_category = self.pool.get('hr.allounce.deduction.categoty')
         payslip = self.pool.get('hr.payslip')
         allowance_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','allow')])
@@ -140,7 +140,7 @@ class employees_salary_report(rml_parse.rml_parse):
                  if other_flag:
                      self.other_list.append(res)
         return None
-    
+
     def cal_monthly_amt(self,emp_id,category):
         tot = 0.0
         cnt = 1
@@ -208,7 +208,7 @@ class employees_salary_report(rml_parse.rml_parse):
             if not res:
                 result.append(0.00)
             res = {}
-            cnt = cnt + 1 
+            cnt = cnt + 1
         cnt = 1
         result.append(tot)
         tot = 0.0
@@ -219,17 +219,17 @@ class employees_salary_report(rml_parse.rml_parse):
 
     def get_deduct(self):
         return self.deduct_list
-    
+
     def get_other(self):
         return self.other_list
-    
+
     def get_total(self):
         return self.total
-    
+
     def get_monthly_total(self):
         return self.month_total_list
-    
+
 report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report)
-       
-       
-               
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_payroll/report/report_payroll_advice.py b/addons/hr_payroll/report/report_payroll_advice.py
index d33ad5affc1..2f4d82c263b 100644
--- a/addons/hr_payroll/report/report_payroll_advice.py
+++ b/addons/hr_payroll/report/report_payroll_advice.py
@@ -6,7 +6,7 @@ from tools import amount_to_text_en
 class payroll_advice_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(payroll_advice_report, self).__init__(cr, uid, name, context)
-        
+
         self.total_amount = 0.00
         self.total_bysal = 0.00
         self.localcontext.update({
@@ -25,17 +25,17 @@ class payroll_advice_report(report_sxw.rml_parse):
         date = mx.DateTime.strptime(input_date, '%Y-%m-%d')
         res['mname']= date.strftime('%B')+'-'+date.strftime('%Y')
         return res
-    
+
     def convert(self,amount, cur):
         amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
         return amt_en
-    
+
     def get_bysal_total(self):
         return self.total_bysal
 
     def get_total(self):
         return self.total_amount
-    
+
     def get_detail(self,line_ids):
         result =[]
         if line_ids:
@@ -50,5 +50,8 @@ class payroll_advice_report(report_sxw.rml_parse):
                 self.total_bysal += l.bysal
                 result.append(res)
         return result
-    
-report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)   
\ No newline at end of file
+
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 7895178de58..4fc9410861d 100755
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -3,7 +3,7 @@
 
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -28,23 +28,23 @@ from report import report_sxw
 from tools import amount_to_text_en
 
 class payslip_report(report_sxw.rml_parse):
-      
+
       def __init__(self, cr, uid, name, context):
 	  super(payslip_report, self).__init__(cr, uid, name, context)
 	  self.localcontext.update({
-            'convert'     : self.convert, 
+            'convert'     : self.convert,
             'get_month'   : self.get_month,
             'get_earnings': self.get_earnings,
             'get_deductions':self.get_deductions,
             'get_leave':self.get_leave,
             'get_others':self.get_others,
           })
- 
+
 
       def convert(self,amount, cur):
           amt_en = amount_to_text_en.amount_to_text(amount,'en',cur)
           return amt_en
-      
+
       def get_others(self,obj):
           res = []
           ids = []
@@ -55,7 +55,7 @@ class payslip_report(report_sxw.rml_parse):
           if len(ids):
               res = payslip_line.browse(self.cr, self.uid, ids)
           return res
-          
+
       def get_leave(self,obj):
           res = []
           ids = []
@@ -66,7 +66,7 @@ class payslip_report(report_sxw.rml_parse):
           if len(ids):
               res = payslip_line.browse(self.cr, self.uid, ids)
           return res
-      
+
       def get_earnings(self,obj):
           res = []
           ids = []
@@ -97,14 +97,14 @@ class payslip_report(report_sxw.rml_parse):
            res['mname']= date.strftime('%B')+"-"+date.strftime('%Y')
            return res['mname']
 
-report_sxw.report_sxw('report.payslip.pdf', 'hr.payslip', 'hr_payroll/report/payslip.rml', parser=payslip_report)   
-
-
-
-
-
-
-
+report_sxw.report_sxw('report.payslip.pdf', 'hr.payslip', 'hr_payroll/report/payslip.rml', parser=payslip_report)
+
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
 
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index 1866ef795b6..66cf05db601 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -64,7 +64,7 @@ class year_salary_report(rml_parse.rml_parse):
         periods = []
         tol_mnths=['Total',0,0,0,0,0,0,0,0,0,0,0,0]     
         emp = pooler.get_pool(self.cr.dbname).get('hr.employee')     
-        emp_ids = form['employee_ids'][0][2]
+        emp_ids = form['employee_ids']
         empll  = emp.browse(self.cr,self.uid, emp_ids)
         fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
         period_ids_l = fiscalyear_obj.period_ids
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index 453998a44ca..085903ad562 100755
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -1,3 +1,26 @@
-import wizard_year_salary
-import wizard_employees_detail
-import wizard_create_analytic
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import hr_payroll_employees_detail
+import hr_payroll_create_analytic
+import hr_payroll_year_salary
diff --git a/addons/hr_payroll/wizard/wizard_create_analytic.py b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
similarity index 54%
rename from addons/hr_payroll/wizard/wizard_create_analytic.py
rename to addons/hr_payroll/wizard/hr_payroll_create_analytic.py
index 371b0a2bda4..cded95390f4 100644
--- a/addons/hr_payroll/wizard/wizard_create_analytic.py
+++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
@@ -1,63 +1,48 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    d$
+#    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 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
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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 wizard
-import pooler
+import time
 
-class wizard_create_analytics(wizard.interface):
-    '''
-    OpenERP Wizard
-    '''
-    form = '''<?xml version="1.0"?>
-    <form string="Process Form">
-        <field name="company_id"/>
-        <newline/>
-        <field name="type"/>
-    </form>'''
+from osv import fields, osv
+from tools.translate import _
 
-    fields = {
-        'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company'},
-        'type': {'string':'Type', 'type':'selection', 'selection':[('bydeg','By Employee Function'), ('byallded','By Allownce / Deduction')]}
-    }
+class hr_payroll_create_analytic(osv.osv_memory):
+   _name = "hr.payroll.create.analytic"
+   _columns = {
+        'company_id': fields.many2one('res.company', 'Company'),
+        'type': fields.selection([('bydeg','By Employee Function'), ('byallded','By Allownce / Deduction')],'Type'),
+       }
 
-    def _get_defaults(self, cr, user, data, context):
-        #TODO : initlize required data
-        
-        
-        return data['form'] 
+   def do_duplicate(self, cr, uid, ids, context=None):
+
+        account_pool =self.pool.get('account.analytic.account')
+        func_pool = self.pool.get('hr.employee.grade')
+        ad_pool = self.pool.get('hr.allounce.deduction.categoty')
+        data = self.read(cr,uid,ids)[0]
+        tpy = data['type']
+        company = data['company_id']
 
-    def _do_duplicate(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        account_pool = pool.get('account.analytic.account')
-        func_pool = pool.get('hr.employee.grade')
-        ad_pool = pool.get('hr.allounce.deduction.categoty')
-        
-        tpy = data['form']['type']
-        company = data['form']['company_id']
-        
         function_ids = func_pool.search(cr, uid, [])
         ad_ids = ad_pool.search(cr, uid, [])
-        
+
         if tpy == 'bydeg':
             for function in func_pool.browse(cr, uid, function_ids):
                 res = {
@@ -78,9 +63,9 @@ class wizard_create_analytics(wizard.interface):
                         'parent_id': fid
                     }
                     account_pool.create(cr, uid, res)
-                    
-                    
-            
+
+
+
         elif tpy == 'byallded':
             res = {
                 'name':'Basic Salary',
@@ -94,7 +79,7 @@ class wizard_create_analytics(wizard.interface):
                     'parent_id': adid
                 }
                 account_pool.create(cr, uid, res)
-            
+
             for ad in ad_pool.browse(cr, uid, ad_ids):
                 res = {
                     'name':ad.name,
@@ -108,17 +93,8 @@ class wizard_create_analytics(wizard.interface):
                         'parent_id': adid
                     }
                     account_pool.create(cr, uid, res)
-            
+
         return {}
-    
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('process', 'Process'))},
-        },
-        'process': {
-            'actions': [_do_duplicate],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-wizard_create_analytics('payroll.analysis')
+hr_payroll_create_analytic()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
new file mode 100644
index 00000000000..bbbd263b2fe
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_payroll_create_form" model="ir.ui.view">
+            <field name="name">Create Analytic</field>
+            <field name="model">hr.payroll.create.analytic</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Process Form">
+		 	     <field name="company_id"/>
+		        <field name="type"/>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="do_duplicate" string="Process" colspan="1" type="object"  icon="gtk-yes"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_view_hr_payroll_create" model="ir.actions.act_window">
+            <field name="name">Create Analytic Structure</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.payroll.create.analytic</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+       <!-- <menuitem  id="menu_wizard_payroll_analysis" 
+            action="action_view_hr_payroll_create" 
+            parent="payroll_configure" 
+            name="Create Analytic Structure" />-->
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
new file mode 100755
index 00000000000..7c14aa82dd5
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -0,0 +1,68 @@
+# -*- 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 time
+
+from osv import fields, osv
+from tools.translate import _
+
+class hr_payroll_employees_detail(osv.osv_memory):
+
+   _name ='hr.payroll.employees.detail'
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel','payroll_id','emp_id', 'Employees',required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)
+       }
+   def _get_fiscalyear(self, cr, uid, ids, context={}):
+        fiscal_ids=self.pool.get('account.fiscalyear').search(cr,uid,[])
+        if fiscal_ids:
+            return fiscal_ids[0]
+        return False
+
+   _defaults = {
+        'fiscalyear_id':_get_fiscalyear,
+    }
+
+   def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return : return report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id'], context=context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'employees.salary',
+            'datas': datas,
+            'nodestroy':True,
+       }
+
+hr_payroll_employees_detail()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
new file mode 100644
index 00000000000..a6c539ddae8
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_hr_payroll_employees_detail" model="ir.ui.view">
+            <field name="name">Employee Salary Statement</field>
+            <field name="model">hr.payroll.employees.detail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Year Salary">
+                 <group col="4" colspan="4"  width="600">
+			    	<group col="2" colspan="1">
+				    	<field name="fiscalyear_id"  align="1.0" />
+				    	<newline/>
+				    	<separator string="Employees" colspan="4"/>
+				    	<field name="employee_ids"  nolabel="1" colspan="2" />
+			    	</group>
+			    	<newline/>
+			    	<group col="2" colspan="1">
+					<button icon='gtk-cancel' special="cancel"
+	        			string="Close" />
+	 				<button name="print_report" string="Print Report"
+	        			 type="object" icon="gtk-print" />
+					</group>
+					</group>
+                </form>
+            </field>
+        </record>
+        <record id="action_hr_payroll_employees_detail" model="ir.actions.act_window">
+            <field name="name">Employee Salary Statement</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.payroll.employees.detail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+	<menuitem id="menu_hr_payroll_employees_detail"
+            icon="STOCK_PRINT"
+            action="action_hr_payroll_employees_detail"
+            parent="menu_hr_payroll_reporting"
+            name="Employee Salary Statement"/>
+</data>
+</openerp>
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
new file mode 100755
index 00000000000..e58cdc8fc1b
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -0,0 +1,70 @@
+# -*- 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 time
+
+from osv import fields, osv
+from tools.translate import _
+
+class hr_payroll_year_salary(osv.osv_memory):
+   _name = "hr.payroll.year.salary"
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel','payroll_year_id','emp_id', 'Employees',required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)  ,
+        'salary_on': fields.selection([('current_month','Current Month Date'),('next_month','Next Month Date')],'Salary On'),
+       }
+
+   def _get_fiscalyear(self, cr, uid, ids, context=None):
+        fiscal_ids=self.pool.get('account.fiscalyear').search(cr,uid,[],context=context)
+        if fiscal_ids:
+            return fiscal_ids[0]
+        return False
+
+   _defaults = {
+        'fiscalyear_id':_get_fiscalyear,
+        'salary_on': 'current_month'
+    }
+
+   def print_report(self, cr, uid, ids, context=None):
+        """
+         To get the date and print the report
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return : return report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id','salary_on'], context=context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'year.salary',
+            'datas': datas,
+            'nodestroy':True,
+       }
+
+hr_payroll_year_salary()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
new file mode 100644
index 00000000000..0360f8fc9b2
--- /dev/null
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_hr_payroll_year_salary" model="ir.ui.view">
+            <field name="name">Salary Register</field>
+            <field name="model">hr.payroll.year.salary</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			   <form string="Year Salary">
+			   <group col="4" colspan="4"  width="600">
+			   <group col="3" colspan="1">
+				    <field name="fiscalyear_id" select="1" colspan="2"/>
+				    <newline/>
+				    <separator string="Employees" colspan="4"/>
+				    <field name="employee_ids"  nolabel="1" colspan="2"/>
+					<newline/>
+			    	<separator string="Salary Deposit Date Option?" colspan="2"/>
+			    	<newline/>
+			    	<field name="salary_on"/>
+				</group>
+			    <newline/>
+			    <group>
+					<button icon='gtk-cancel' special="cancel"
+		        			string="Close" />
+					<button name="print_report" string="Print Report"
+		        			 type="object" icon="gtk-print" />
+	        	</group>
+			</group>
+			</form>
+            </field>
+        </record>
+        <record id="action_hr_payroll_year_salary" model="ir.actions.act_window">
+            <field name="name">Salary Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.payroll.year.salary</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem  id="menu_wizard_print_year_salary"
+            icon="STOCK_PRINT"
+            action="action_hr_payroll_year_salary"
+            parent="menu_hr_payroll_reporting"
+            name="Salary Register"
+           />
+
+</data>
+</openerp>
diff --git a/addons/hr_payroll/wizard/wizard_employees_detail.py b/addons/hr_payroll/wizard/wizard_employees_detail.py
deleted file mode 100755
index 707a428229e..00000000000
--- a/addons/hr_payroll/wizard/wizard_employees_detail.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import datetime
-import pooler
-import time
-import netsvc
-
-form='''<?xml version="1.0"?>
-<form string="Year Salary">
-    <field name="fiscalyear_id" select="1" colspan="2"/>
-    <newline/>
-    <field name="employee_ids" colspan="2"/>
-    <newline/>
-</form>'''
-fields = {    
-    'fiscalyear_id':{'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True },
-    'employee_ids':{'string':'Employees', 'type':'many2many','relation':'hr.employee','required':True},
-       }
-
-class wizard_print(wizard.interface):
-    def _get_defaults(self, cr, uid, data, context={}):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear_id'] = fiscalyear_obj.find(cr, uid)
-        return data['form']
-
-    states={
-        'init':{
-            'actions':[_get_defaults],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'employees.salary', 'state':'end'}
-        }
-    }
-wizard_print('wizard.employees.detail')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_payroll/wizard/wizard_year_salary.py b/addons/hr_payroll/wizard/wizard_year_salary.py
deleted file mode 100755
index efab1695ba1..00000000000
--- a/addons/hr_payroll/wizard/wizard_year_salary.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import datetime
-import pooler
-import time
-import netsvc
-
-form='''<?xml version="1.0"?>
-<form string="Year Salary">
-    <field name="fiscalyear_id" select="1" colspan="2"/>
-    <newline/>
-    <field name="employee_ids" colspan="2"/>
-    <newline/>
-    <separator string="Salary Deposit Date Option?" colspan="2"/>
-    <newline/>
-    <field name="salary_on"/>
-</form>'''
-fields = {    
-    'fiscalyear_id':{'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True },
-    'employee_ids':{'string':'Employees', 'type':'many2many','relation':'hr.employee','required':True},
-    'salary_on':{
-        'string':"Salary On",
-        'type':'selection',
-        'selection':[('current_month','Current Month Date'),('next_month','Next Month Date')],
-        'default': lambda *a:'current_month'
-    },
-       }
-
-class wizard_print(wizard.interface):
-    def _get_defaults(self, cr, uid, data, context={}):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear_id'] = fiscalyear_obj.find(cr, uid)
-        return data['form']
-
-    states={
-        'init':{
-            'actions':[_get_defaults],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'year.salary', 'state':'end'}
-        }
-    }
-wizard_print('wizard.year.salary')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_payroll_account/__init__.py b/addons/hr_payroll_account/__init__.py
new file mode 100644
index 00000000000..81979b0ae58
--- /dev/null
+++ b/addons/hr_payroll_account/__init__.py
@@ -0,0 +1,23 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import hr_payroll_account
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
new file mode 100644
index 00000000000..33c17518ab9
--- /dev/null
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -0,0 +1,46 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Human Resource Payroll Accounting',
+    'version': '1.0',
+    'category': 'Generic Modules/Human Resources',
+    'description': """Generic Payroll system Integrated with Accountings
+    * Expanse Encoding
+    * Payment Encoding
+    * Comany Contribution Managemet
+    """,
+    'author':'Tiny/Axelor',
+    'website':'http://www.openerp.com',
+    'depends': [
+        'hr_payroll',
+        'account',
+    ],
+    'init_xml': [
+    ],
+    'update_xml': [
+        "hr_payroll_account_view.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
new file mode 100644
index 00000000000..9c1ab7a5c30
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -0,0 +1,613 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import netsvc
+from osv import osv
+from osv import fields
+from tools import config
+from tools.translate import _
+
+from datetime import date
+from datetime import datetime
+from datetime import timedelta
+
+def prev_bounds(cdate=False):
+    when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
+    this_first = date(when.year, when.month, 1)
+    month = when.month + 1
+    year = when.year
+    if month > 12:
+        month = 1
+        year += 1
+    next_month = date(year, month, 1)
+    prev_end = next_month - timedelta(days=1)
+    return this_first, prev_end
+
+class hr_payslip(osv.osv):
+    '''
+    Pay Slip
+    '''
+    _inherit = 'hr.payslip'
+    _description = 'Pay Slip'
+    
+    _columns = {
+        'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
+        'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
+        'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
+        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
+    }
+    
+    def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):
+        slip_move = self.pool.get('hr.payslip.account.move')
+        for slip in ids:
+            res = {
+                'slip_id':slip,
+                'move_id':voucher,
+                'sequence':sequence,
+                'name':name
+            }
+            slip_move.create(cr, uid, res)
+    
+    def cancel_sheet(self, cr, uid, ids, context={}):
+        move_pool = self.pool.get('account.move')
+        slip_move = self.pool.get('hr.payslip.account.move')
+        
+        move_ids = []
+        for slip in self.browse(cr, uid, ids, context):
+            for line in slip.move_ids:
+                move_ids.append(line.id)
+                if line.move_id:
+                    if line.move_id.state == 'posted':
+                        move_pool.button_cancel(cr, uid [line.move_id.id], context)
+                    move_pool.unlink(cr, uid, [line.move_id.id])
+        
+        slip_move.unlink(cr, uid, move_ids)
+        self.write(cr, uid, ids, {'state':'cancel'})
+        return True
+    
+    def process_sheet(self, cr, uid, ids, context={}):
+        move_pool = self.pool.get('account.move')
+        movel_pool = self.pool.get('account.move.line')
+        invoice_pool = self.pool.get('account.invoice')
+        
+        for slip in self.browse(cr,uid,ids):    
+            line_ids = []
+            partner = False
+            partner_id = False
+            exp_ids = []
+            
+            partner = slip.employee_id.bank_account_id.partner_id
+            partner_id = partner.id
+            
+            fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+            if not fiscal_year_ids:
+                raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
+            fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+            year_exist = False
+            for fiscal_year in fiscal_year_objs:
+                if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
+                    year_exist = True
+            if not year_exist:
+                raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
+            search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
+            if not search_period:
+                raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
+            period_id = search_period[0]
+            name = 'Payment of Salary to %s' % (slip.employee_id.name)
+            move = {
+                'journal_id': slip.bank_journal_id.id,
+                'period_id': period_id, 
+                'date': slip.date,
+                'type':'bank_pay_voucher',
+                'ref':slip.number,
+                'narration': name
+            }
+            move_id = move_pool.create(cr, uid, move)
+            self.create_voucher(cr, uid, [slip.id], name, move_id)
+            
+            name = "To %s account" % (slip.employee_id.name)
+            ded_rec = {
+                'move_id':move_id,
+                'name': name,
+                #'partner_id': partner_id,
+                'date': slip.date, 
+                'account_id': slip.employee_id.property_bank_account.id, 
+                'debit': 0.0,
+                'credit' : slip.total_pay,
+                'journal_id' : slip.journal_id.id,
+                'period_id' :period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, ded_rec)]
+            name = "By %s account" % (slip.employee_id.property_bank_account.name)
+            cre_rec = {
+                'move_id':move_id,
+                'name': name,
+                'partner_id': partner_id,
+                'date': slip.date,
+                'account_id': partner.property_account_payable.id,
+                'debit':  slip.total_pay,
+                'credit' : 0.0,
+                'journal_id' : slip.journal_id.id,
+                'period_id' :period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, cre_rec)]
+            
+            other_pay = slip.other_pay
+            #Process all Reambuse Entries
+            for line in slip.line_ids:
+                if line.type == 'otherpay' and line.expanse_id.invoice_id:
+                    if not line.expanse_id.invoice_id.move_id:
+                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
+                    invids = [line.expanse_id.invoice_id.id]
+                    amount = line.total
+                    acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
+                    period_id = slip.period_id.id
+                    journal_id = slip.bank_journal_id.id
+                    name = '[%s]-%s' % (slip.number, line.name)
+                    invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
+                    other_pay -= amount
+                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+                    l_ids = movel_pool.search(cr, uid, [('name','=',name)])
+                    line_ids += l_ids
+                    
+                    l_ids = movel_pool.search(cr, uid, [('invoice','=',line.expanse_id.invoice_id.id)])
+                    exp_ids += l_ids
+            
+            #Process for Other payment if any
+            other_move_id = False
+            if slip.other_pay > 0:
+                narration = 'Payment of Other Payeble amounts to %s' % (slip.employee_id.name)
+                move = {
+                    'journal_id': slip.bank_journal_id.id,
+                    'period_id': period_id, 
+                    'date': slip.date,
+                    'type':'bank_pay_voucher',
+                    'ref':slip.number,
+                    'narration': narration
+                }
+                other_move_id = move_pool.create(cr, uid, move)
+                self.create_voucher(cr, uid, [slip.id], narration, move_id)
+                
+                name = "To %s account" % (slip.employee_id.name)
+                ded_rec = {
+                    'move_id':other_move_id,
+                    'name':name,
+                    'date':slip.date, 
+                    'account_id':slip.employee_id.property_bank_account.id, 
+                    'debit': 0.0,
+                    'credit': other_pay,
+                    'journal_id':slip.journal_id.id,
+                    'period_id':period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                name = "By %s account" % (slip.employee_id.property_bank_account.name)
+                cre_rec = {
+                    'move_id':other_move_id,
+                    'name':name,
+                    'partner_id':partner_id,
+                    'date':slip.date,
+                    'account_id':partner.property_account_payable.id,
+                    'debit': other_pay,
+                    'credit':0.0,
+                    'journal_id':slip.journal_id.id,
+                    'period_id':period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, cre_rec)]
+            
+            rec = {
+                'state':'done',
+                'move_payment_ids':[(6, 0, line_ids)],
+                'paid':True
+            }
+            self.write(cr, uid, [slip.id], rec)
+            for exp_id in exp_ids:
+                self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]})
+            
+        return True
+    
+    def account_check_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'accont_check'})
+        return True
+    
+    def hr_check_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'hr_check'})
+        return True
+    
+    def verify_sheet(self, cr, uid, ids, context={}):
+        
+        move_pool = self.pool.get('account.move')
+        movel_pool = self.pool.get('account.move.line')
+        exp_pool = self.pool.get('hr.expense.expense')
+        
+        for slip in self.browse(cr,uid,ids):
+            total_deduct = 0.0
+            
+            line_ids = []
+            partner = False
+            partner_id = False
+            
+            if not slip.employee_id.bank_account_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !' % (slip.employee_id.name)))
+            
+            if not slip.employee_id.bank_account_id.partner_id:
+                raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !' % (slip.employee_id.name)))
+            
+            partner = slip.employee_id.bank_account_id.partner_id
+            partner_id = slip.employee_id.bank_account_id.partner_id.id
+            
+            period_id = False
+            
+            if slip.period_id:
+                period_id = slip.period_id.id
+            else:
+                fiscal_year_ids = self.pool.get('account.fiscalyear').search(cr, uid, [])
+                if not fiscal_year_ids:
+                    raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
+                fiscal_year_objs = self.pool.get('account.fiscalyear').read(cr, uid, fiscal_year_ids, ['date_start','date_stop'])
+                year_exist = False
+                for fiscal_year in fiscal_year_objs:
+                    if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
+                        year_exist = True
+                if not year_exist:
+                    raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s'%slip.date))
+                search_period = self.pool.get('account.period').search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)])
+                if not search_period:
+                    raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s'%slip.date))
+                period_id = search_period[0]
+            
+            move = {
+                #'name': slip.name, 
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id, 
+                'date': slip.date,
+                'ref':slip.number,
+                'narration': slip.name
+            }
+            move_id = move_pool.create(cr, uid, move)
+            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
+            
+            line = {
+                'move_id':move_id,
+                'name': "By Basic Salary / " + slip.employee_id.name,
+                'date': slip.date,
+                'account_id': slip.employee_id.salary_account.id, 
+                'debit': slip.basic,
+                'credit': 0.0,
+                'quantity':slip.working_days,
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id,
+                'analytic_account_id': False,
+                'ref':slip.number
+            }
+            
+            #Setting Analysis Account for Basic Salary
+            if slip.employee_id.analytic_account:
+                line['analytic_account_id'] = slip.employee_id.analytic_account.id
+            
+            move_line_id = movel_pool.create(cr, uid, line)
+            line_ids += [move_line_id]
+            
+            line = {
+                'move_id':move_id,
+                'name': "To Basic Paysble Salary / " + slip.employee_id.name,
+                'partner_id': partner_id,
+                'date': slip.date, 
+                'account_id': slip.employee_id.employee_account.id, 
+                'debit': 0.0,
+                'quantity':slip.working_days,
+                'credit': slip.basic,
+                'journal_id': slip.journal_id.id,
+                'period_id': period_id,
+                'ref':slip.number
+            }
+            line_ids += [movel_pool.create(cr, uid, line)]
+            
+            for line in slip.line_ids:
+                name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
+                amount = line.total
+                
+                if line.type == 'leaves':
+                    continue
+                
+                rec = {
+                    'move_id':move_id,
+                    'name': name,
+                    'date': slip.date, 
+                    'account_id': line.account_id.id, 
+                    'debit': 0.0,
+                    'credit' : 0.0,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'analytic_account_id':False,
+                    'ref':slip.number,
+                    'quantity':1
+                }
+                
+                #Setting Analysis Account for Salary Slip Lines
+                if line.analytic_account_id:
+                    rec['analytic_account_id'] = line.analytic_account_id.id
+                else: 
+                    rec['analytic_account_id'] = slip.deg_id.account_id.id
+                    
+                if line.type == 'allowance' or line.type == 'otherpay':
+                    rec['debit'] = amount
+                    if not partner.property_account_payable:
+                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
+                    ded_rec = {
+                        'move_id':move_id,
+                        'name': name,
+                        'partner_id': partner_id,
+                        'date': slip.date, 
+                        'account_id': partner.property_account_payable.id, 
+                        'debit': 0.0,
+                        'quantity':1,
+                        'credit' : amount,
+                        'journal_id' : slip.journal_id.id,
+                        'period_id' :period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                elif line.type == 'deduction' or line.type == 'otherdeduct':
+                    if not partner.property_account_receivable:
+                        raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
+                    rec['credit'] = amount
+                    total_deduct += amount
+                    ded_rec = {
+                        'move_id':move_id,
+                        'name': name,
+                        'partner_id': partner_id,
+                        'date': slip.date, 
+                        'quantity':1,
+                        'account_id': partner.property_account_receivable.id, 
+                        'debit': amount,
+                        'credit' : 0.0,
+                        'journal_id' : slip.journal_id.id,
+                        'period_id' :period_id,
+                        'ref':slip.number
+                    }
+                    line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                
+                line_ids += [movel_pool.create(cr, uid, rec)]
+                
+#                if line.company_contrib > 0:
+#                    company_contrib = line.company_contrib
+##                    if line.category_id.amount_type == 'per':
+##                        company_contrib = (amount * line.category_id.contribute_per)
+
+#                    narration = """Company Contribution of %s Encode same as a Company Expanse @ %s""" % (line.name, company_contrib)
+#                    move = {
+#                        #'name': slip.name, 
+#                        'journal_id': slip.journal_id.id,
+#                        'period_id': period_id, 
+#                        'date': slip.date,
+#                        'ref':slip.number,
+#                        'narration': narration
+#                    }
+#                    company_contrib_move_id = move_pool.create(cr, uid, move)
+#                    name = "[%s] - %s / %s - Company Contribution" % (line.code, line.name, slip.employee_id.name)
+#                    self.create_voucher(cr, uid, [slip.id], name, company_contrib_move_id)
+#                    
+#                    ded_deb = {
+#                        'move_id':company_contrib_move_id,
+#                        'name': name,
+#                        'date': slip.date, 
+#                        'quantity':1,
+#                        'account_id': line.category_id.account_id.id,
+#                        'debit': company_contrib,
+#                        'credit' : 0.0,
+#                        'journal_id': slip.journal_id.id,
+#                        'period_id': period_id,
+#                        'ref':slip.number
+#                    }
+#                    line_ids += [movel_pool.create(cr, uid, ded_deb)]
+#                    ded_cre = {
+#                        'move_id':company_contrib_move_id,
+#                        'name': name,
+#                        'date': slip.date, 
+#                        'quantity':1,
+#                        'account_id': line.category_id.register_id.account_id.id,
+#                        'debit': 0.0,
+#                        'credit' : company_contrib,
+#                        'journal_id': slip.journal_id.id,
+#                        'period_id': period_id,
+#                        'ref':slip.number
+#                    }
+#                    line_ids += [movel_pool.create(cr, uid, ded_cre)]
+#                    
+#                    if line.category_id.include_in_salary:
+#                        narration = """Company Contribution of %s Deducted from Employee %s""" % (line.name, company_contrib)
+#                        move = {
+#                            #'name': slip.name, 
+#                            'journal_id': slip.journal_id.id,
+#                            'period_id': period_id, 
+#                            'date': slip.date,
+#                            'ref':slip.number,
+#                            'narration': narration
+#                        }
+#                        include_in_salary_move_id = move_pool.create(cr, uid, move)
+#                        self.create_voucher(cr, uid, [slip.id], narration, include_in_salary_move_id)
+#                        
+#                        total_deduct += company_contrib
+#                        ded_deb = {
+#                            'move_id':include_in_salary_move_id,
+#                            'name': name,
+#                            'partner_id': partner_id,
+#                            'date': slip.date, 
+#                            'quantity':1,
+#                            'account_id': partner.property_account_receivable.id,
+#                            'debit': company_contrib,
+#                            'credit' : 0.0,
+#                            'journal_id': slip.journal_id.id,
+#                            'period_id': period_id,
+#                            'ref':slip.number
+#                        }
+#                        line_ids += [movel_pool.create(cr, uid, ded_deb)]
+#                        ded_cre = {
+#                            'move_id':include_in_salary_move_id,
+#                            'name': name,
+#                            'date': slip.date, 
+#                            'quantity':1,
+#                            'account_id': line.category_id.account_id.id,
+#                            'debit': 0.0,
+#                            'credit' : company_contrib,
+#                            'journal_id': slip.journal_id.id,
+#                            'period_id': period_id,
+#                            'ref':slip.number
+#                        }
+#                        line_ids += [movel_pool.create(cr, uid, ded_cre)]
+
+                #make an entry line to contribution register
+#                if line.category_id.register_id:
+#                    ctr = {
+#                        'register_id':line.category_id.register_id.id,
+#                        'name':line.name,
+#                        'code':line.code,
+#                        'employee_id':slip.employee_id.id,
+#                        'period_id':period_id,
+#                        'emp_deduction':amount,
+#                    }
+#                    if line.category_id.contribute:
+#                        ctr['comp_deduction'] = amount
+#                    
+#                    company = 0.0
+#                    employee = 0.0
+#                    if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        new_amount = (amount * (line.category_id.contribute_per / (1+line.category_id.contribute_per)))
+#                        company = new_amount
+#                        employee = amount - company
+#                    
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount - company
+
+#                    elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'per':
+#                        company = amount * line.category_id.contribute_per
+#                        employee = amount
+#                    
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+#                        company = line.category_id.contribute_per
+#                        employee = amount
+
+#                    elif line.category_id.contribute and not line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+#                        company = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, line.slip_id.basic, context)
+#                        employee = amount
+#                        
+#                    ctr['emp_deduction'] = employee
+#                    ctr['comp_deduction'] = company
+#                        
+#                    self.pool.get('hr.contibution.register.line').create(cr, uid, ctr)
+
+            adj_move_id = False
+            if total_deduct > 0:
+                move = {
+                    'journal_id': slip.journal_id.id,
+                    'period_id': period_id,
+                    'date': slip.date,
+                    'ref':slip.number,
+                    'narration': 'Adjustment : %s' % (slip.name)
+                }
+                adj_move_id = move_pool.create(cr, uid, move)
+                name = "Adjustment Entry - %s" % (slip.employee_id.name)
+                self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
+                
+                ded_rec = {
+                    'move_id':adj_move_id,
+                    'name': name,
+                    'partner_id': partner_id,
+                    'date': slip.date, 
+                    'account_id': partner.property_account_receivable.id, 
+                    'debit': 0.0,
+                    'quantity':1,
+                    'credit' : total_deduct,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, ded_rec)]
+                cre_rec = {
+                    'move_id':adj_move_id,
+                    'name': name,
+                    'partner_id': partner_id,
+                    'date': slip.date,
+                    'account_id': partner.property_account_payable.id, 
+                    'debit': total_deduct,
+                    'quantity':1,
+                    'credit' : 0.0,
+                    'journal_id' : slip.journal_id.id,
+                    'period_id' :period_id,
+                    'ref':slip.number
+                }
+                line_ids += [movel_pool.create(cr, uid, cre_rec)]
+
+            rec = {
+                'state':'confirm',
+                'move_line_ids':[(6, 0,line_ids)],
+            }
+            if not slip.period_id:
+                rec['period_id'] = period_id
+            
+            dates = prev_bounds(slip.date)
+            exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')])
+            if exp_ids:
+                acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                for exp in exp_pool.browse(cr, uid, exp_ids):
+                    exp_res = {
+                        'name':exp.name,
+                        'amount_type':'fix',
+                        'type':'otherpay',
+                        'category_id':exp.category_id.id,
+                        'amount':exp.amount,
+                        'slip_id':slip.id,
+                        'expanse_id':exp.id,
+                        'account_id':acc
+                    }
+                    self.pool.get('hr.payslip.line').create(cr, uid, exp_res)
+            
+            self.write(cr, uid, [slip.id], rec)
+            
+        return True
+        
+hr_payslip()
+
+class account_move_link_slip(osv.osv):
+    '''
+    Account Move Link to Pay Slip
+    '''
+    _name = 'hr.payslip.account.move'
+    _description = 'Account Move Link to Pay Slip'
+    _columns = {
+        'name':fields.char('Name', size=256, required=True, readonly=False),
+        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
+        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
+        'sequence': fields.integer('Sequence'),
+    }
+account_move_link_slip()
+
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
new file mode 100644
index 00000000000..6ef6c812c0b
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    
+         <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+            <field name="arch" type="xml">
+                <page string="Accounting Details" position="replace">
+                    <page string="Accounting Details">
+                        <group col="4" colspan="3">
+                            <separator colspan="4" string="Accounting Informations"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+                                <tree string="Accounting Vouchers">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="move_id"/>
+                                </tree>
+                                <form string="Accounting Vouchers">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="move_id"/>
+                                </form>
+                            </field>
+                        </group>
+                        <group col="2" colspan="1">
+                            <separator colspan="2" string="Other Informations"/>
+                            <field name="paid" readonly="1"/>
+                            <field name="company_id"/>
+                            <field name="register_id"/>
+                            <field name="deg_id"/>
+                            <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
+                        </group>
+                        <separator colspan="4" string="Description"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+        <record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_hr_payslip_form_inherit"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Account Lines">
+                        <field name="move_line_ids" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Payment Lines">
+                        <field name="move_payment_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/hr_payroll_account/hr_payroll_account_workflow.xml b/addons/hr_payroll_account/hr_payroll_account_workflow.xml
new file mode 100644
index 00000000000..f3c0eaccb06
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_account_workflow.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="act_account_check" model="workflow.activity">
+            <field name="wkf_id" ref="hr_payroll.wkf"/>
+            <field name="name">account_check</field>
+            <field name="action">account_check_sheet()</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="hr_payroll.t4" model="workflow.transition">
+            <field name="act_from" ref="hr_payroll.act_confirm"/>
+            <field name="act_to" ref="act_account_check"/>
+            <field name="condition">True</field>
+            <field name="signal">account_verify_sheet</field>
+        </record>
+        
+        <record id="t3" model="workflow.transition">
+            <field name="act_from" ref="act_account_check"/>
+            <field name="act_to" ref="hr_payroll.act_done"/>
+            <field name="condition">True</field>
+            <field name="signal">final_verify_sheet</field>
+        </record>
+        
+        <record id="hr_payroll.t9" model="workflow.transition">
+            <field name="act_from" ref="act_account_check"/>
+            <field name="act_to" ref="hr_payroll.act_cancel"/>
+            <field name="signal">cancel_sheet</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 3b54631415e..f6527d5c6e8 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -81,12 +81,13 @@
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-		
+
 		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 		<menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-		
+
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 7f2df2e815e..41fb3520bcc 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -59,7 +59,7 @@
                         <field name="date" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -93,7 +93,7 @@
         </record>
         <menuitem
             action="action_hr_timesheet_report_stat_all"
-            id="menu_hr_timesheet_report_all" 
+            id="menu_hr_timesheet_report_all"
             parent="menu_hr_reporting_timesheet" sequence="0"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index d0573745208..bc33fece491 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -2,8 +2,5 @@
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1
 "access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","hr.group_hr_user",1,1,1,0
 "access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","hr.group_hr_user",1,0,0,0
-"access_hr_sign_in_project","hr.sign.in.project","model_hr_sign_in_project","hr.group_hr_user",1,1,1,1
-"access_hr_sign_out_project","hr.sign.out.project","model_hr_sign_out_project","hr.group_hr_user",1,1,1,1
-"access_hr_analytal_timesheet_employee","hr.analytical.timesheet.employee","model_hr_analytical_timesheet_employee","hr.group_hr_manager",1,1,1,1
 "access_hr_analytal_timesheet_user","hr.analytical.timesheet.user","model_hr_analytical_timesheet_users","hr.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","hr.group_hr_manager",1,0,0,0
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 4c5ed013e1d..b895ace8a60 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,19 +8,21 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_id" colspan="3" />
-                	</group>
+				<form string="Employee Timesheet">
+					<group colspan="4">
+					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
+						<field name="month"/>
+						<field name="year"/>
+						<field name="user_id" colspan="3"/>
+					</group>
+					<separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
-               </form>
-            </field>
-        </record>
+                </form>
+			</field>
+		</record>
 
 		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
             <field name="name">Employee Timesheet</field>
@@ -44,13 +46,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print My Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-                	</group>
+                    <group colspan="4">
+                    <separator string="This wizard will print monthly timesheet" colspan="4"/>
+                        <field name="month"/>
+                        <field name="year"/>
+                    </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
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 fa1f4a80c9a..cb51fcc1cb3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,17 +8,21 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employees Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_ids" colspan="3" />
-                	</group>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
-                   </group>
-               </form>
+				<form string="Employees Timesheet">
+					<group height="260" width="460">
+						<group colspan="4">
+							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
+							<field name="month"/>
+							<field name="year"/>
+							<field name="user_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group colspan="4" col="6">
+							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b56ecd75769..70104c71ef5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -116,6 +116,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+     <!--   <field name="search_view_id" ref="account.view_account_analytic_account_search"/> -->
         </record>
         <menuitem
             action="action_hr_analytic_timesheet_open_tree"
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 53e0dbc1de1..f58f02e36d8 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 38a807bf7f5..0a8cb6b382f 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -307,10 +307,11 @@ msgid "Display date in the history of works"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.final.invoice.create,init,date:0
-#: wizard_field:hr.timesheet.invoice.create,init,date:0
+#: field:random.timesheet.lines,date:0 field:report.random.timesheet,date:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
@@ -419,9 +420,9 @@ msgid "Choose accounts you want to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.create,init,product:0
+#: field:random.timesheet.lines,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -471,9 +472,9 @@ msgid "Types of invoicing"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:account.analytic.line,to_invoice:0
+#: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Издаване на фактура"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
@@ -482,8 +483,303 @@ msgid "Unclosed Invoiceable Accounts"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-#: wizard_field:hr.timesheet.final.invoice.create,init,price:0
-#: wizard_field:hr.timesheet.invoice.create,init,price:0
+#: field:report_timesheet.user,cost:0
 msgid "Cost"
+msgstr "Разход"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,quantity:0
+#: field:report.random.timesheet,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.account,name:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,amount:0
+msgid "Amount"
+msgstr "Количество"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,uom_id:0
+msgid "UoM"
+msgstr "Мерни единици"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Моите дневни графици според сметка"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "График според потребител"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "График според сметка"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "График според сметка"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Превърни \"разходи\" на фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Мой график за месеца"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Случайни редове от график"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Графици"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Графици според сметка"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Превърни графици във фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Графици според ден"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Дневен график според сметка"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "График според сметка"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "График – Докладване"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Създай график от фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Този месец"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Моите графици според сметка"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Случаен доклад за график"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Потребител"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Случайни графици"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Дневен график според сметка"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Случайни редове от графици"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Към фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "График според потребител"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "График според фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Случаен график"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Основна сметка"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "График по ден"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Мойте графици превърнати във фактура"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Дневен график по сметка"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Аналитична сметка"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Управител"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "График според потребител (този месец)"
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index c9298c86543..a59b68cbb41 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index c3233ae86b0..0720f323183 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-11-17 07:10+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -495,3 +495,298 @@ msgstr "Comptes facturables no tancats"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Cost"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Compte analític a tancar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Màx. quantitat"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Compte analític"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Data límit"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Informes comptabilitat analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Comptes analítics expirats"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Línies a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Línies analítiques a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Preu venda"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Informes - Línies analítiques"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Import"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Línies analítiques per informe facturació"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Els meus fulls de serveis diaris per compte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Full de serveis per usuari"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Full de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Full de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "El meu full de serveis del mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Línies fulls de serveis aleatoris"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Fulls de treball"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Fulls de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Fulls de serveis a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Fulls de serveis per dia"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Full de serveis diària per compte"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Full de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Informes - Full de serveis"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Full de serveis per factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Aquest mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Els meus fulls de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Informe full de serveis aleatori"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Fulls de serveis aleatoris"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Full de serveis diària per compte"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Línies full de serveis aleatoris"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projecte"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Full de serveis per usuari"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Full de serveis per factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Full de serveis aleatori"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Compte general"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Full de serveis per dia"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Els meus fulls de serveis a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Full de serveis diària per compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Mòdul que afegeix vistes de fulls de serveis com\n"
+"    Tots els mesos, fulls de serveis per usuari, full de serveis del mes, "
+"fulls de serveis per compte"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Director"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Full de serveis per usuari (aquest mes)"
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 6b8e109b025..0cabf4ef9c3 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 8febf6b6614..2927c9552d9 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -95,8 +95,9 @@ msgid ""
 "an automatic invoice rate on analytic accounts."
 msgstr ""
 "Hake dieses Feld an, wenn Sie eine automatische Rechnungsstellung auf Basis "
-"von Kosten in diesem Analytischen Journal wünschen: Zeiterfassung, Ausgaben, "
-"... Sie können einen automatischen Anteil auf Analytischen Konten ausweisen."
+"von Kosten in diesem Analytischen Journal wünschen: Zeiterfassung, "
+"Ausgaben, ... Sie können einen automatischen Anteil auf Analytischen Konten "
+"ausweisen."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
@@ -496,3 +497,297 @@ msgstr "Offene Abzurechnende Analysekonten"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Kosten"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Abzuschliessende Analysekonten"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Max Anzahl"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Analytisches Konto"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Deadline"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Reporting Analyse Konten"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Überfällige Analytische Konten"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Einzelpositionen zu berechnen"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analytische Buchungen zur Abrechnung"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Verkaufspreis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "analytische Buchungen - Berichte"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Betrag"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Report abrechenbare analyt. Buchungen"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UoM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Tägliche Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Zeiterfassung nach Benutzer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Abzurechnende Kosten"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Monatliche Zeiterfassung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Zufällige Zeitaufzeichnungszeilen"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Zeiterfassung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Zeiterfassungen pro Konto"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Abrechenbare Zeiten"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Zeiterfassung pro Tag"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Tägliche Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Arbeitszeitaufzeichnung - Berichte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Zeiterfassung nach Rechnung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Dieser Monat"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Meine Zeiterfassung nach Analysekonten"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Zufälliger Zeituaufzeichungsbericht"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "zufällige Zeitaufzeichnungen"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Tägliche Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "zufällige Zeitaufzeichnungszeilen"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projektportal"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Zu Berechnen"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Zeiterfassung nach Benutzer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Zeiterfassung nach Rechnung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Zufällige Zeitaufzeichnung"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Sachkonto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Tägliche Zeiterfassung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Meine abrechenbare Zeiterfassung"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Tägliche Zeiterfassung nach Konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Module für Arbeitszeitaufzeichungen\n"
+"    Alle Monate, Arbeitszeitaufzeichnung je Benutzer/Monat/Konto"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Zeiterfassung nach Benutzer (aktueller Monat)"
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index cf10a20f49f..033f700cb36 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -500,37 +500,118 @@ msgstr "Ανοικτοί Λογαριασμοί προς Τιμολόγηση"
 msgid "Cost"
 msgstr "Κόστος"
 
-#, python-format
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Αναλυτικός λογαριασμός προς κλείσιμο"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Μέγιστη Ποσότητα"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Αναλυτικός λογαριασμός"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Χρονικό Όριο"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Αναφορές Αναλυτικού Λογαριασμού"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Ληγμένοι αναλυτικοί λογαριασμοί"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Ποσότητα"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Γραμμές προς τιμολόγηση"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Γραμμές Αναλυτικές προς Τιμολόγηση"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Τιμή Πώλησης"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Γραμμές αναλυτικής - Αναφορές"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Μήνας"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Ποσό"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Αναφορά Γραμμών Αναλυτικής Προς Τιμολόγηση"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "1η ΜΜ"
+
 #~ msgid "Analytic account incomplete"
 #~ msgstr "Ο Αναλυτικός Λογαριασμός είναι ημιτελής"
 
 #~ msgid "Timesheet profit"
 #~ msgstr "Κέρδος Xρόνου Eργασίας"
 
-#, python-format
 #~ msgid "Partner incomplete"
 #~ msgstr "Συνεργάτης ημιτελής"
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Σφάλμα!"
 
-#, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "Δεν μπορείτε να τροποποιήσετε μια τιμολογημένη αναλυτική γραμμή!"
 
-#, python-format
 #~ msgid "Invoices"
 #~ msgstr "Τιμολόγια"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Σφάλμα"
 
-#, python-format
 #~ msgid "Balance product needed"
 #~ msgstr "Χρειάζεται προϊόν υπολοίπου"
 
-#, python-format
 #~ msgid "Please fill a Balance product in the wizard"
 #~ msgstr "Παρακαλώ συμπληρώστε ένα Εξισορροποιητικό Προϊόν"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 53fe459a86e..5f86d3ebeb9 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-23 17:14+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -495,3 +495,298 @@ msgstr "Cuentas facturables no cerradas"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Coste"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Cuenta analítica a cerrar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Máx. cantidad"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Informes de contabilidad analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Cuentas analíticas expiradas"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Precio venta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Informes - Líneas analíticas"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Líneas analíticas para informe facturación"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Mis hojas de servicios diarios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Mi hoja de servicios del mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Líneas hoja de servicios aleatorias"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Hojas de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Hojas de servicios a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Hojas de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Hoja de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Informes - Hoja de servicios"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Mis hojas de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Informe hoja de servicios aleatorio"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Hojas de servicios aleatorias"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Líneas hoja de servicios aleatorias"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Hoja de servicios por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Hoja de servicios por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Hoja de servicios aleatoria"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Hoja de servicios por día"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Mis hojas de servicios a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Hoja de servicios diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Módulo que añade vistas de hojas de servicios como\n"
+"    Todos los meses, Hojas de servicios por usuario, Hoja de servicios del "
+"mes,  Hojas de servicios por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Hoja de servicios por usuario (este mes)"
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index 47cf877efa0..854dfae3c84 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -494,3 +494,298 @@ msgstr "Cuentas facturables no cerradas"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Costo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Cuenta analítica a cerrar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Máx. cantidad"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Provincia"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Informes de cuentas analíticas"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Cuentas analíticas expiradas"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Líneas analíticas para facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Precio de venta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Lineas analíticas - Informes"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Líneas analíticas para reporte de facturación"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Mis hojas de tareas diarias por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Hoja de tareas por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Hoja de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Hoja de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Mi hoja de tareas del mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Lineas de hojas de tareas aleatorias"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Hojas de tareas"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Hojas de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Hojas de tareas a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Hojas de tareas por día"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Hoja de tareas diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Hoja de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Hojas de tareas - Informes"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Hoja de tareas por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Mis hojas de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Reporte de hojas de tareas aleatorias"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Hojas de tareas aleatorias"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Hoja de tareas diaria por cuenta"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Lineas de hojas de tareas aleatorias"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Hoja de tareas por usuario"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Hoja de tareas por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Hojas de tareas aleatorias"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Cuenta general"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Hojas de tareas por día"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Mis hojas de tareas a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Hojas de tareas diarias por cuenta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Módulo para agregar vistas de hojas de tareas como\n"
+"    Todos los meses, Hojas de tareas por usuario, Hojas de tareas por mes, "
+"Hojas de tareas por cuenta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Hoja de servicio por usuario (este mes)"
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index 31530ed8617..d7169512eeb 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -487,3 +487,298 @@ msgstr "Sulgemata arveldatavad kontod"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Maksumus"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Analüütiline konto sulgeda"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Maks kogus"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Analüütiline konto"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Olek"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Tähtaeg"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Analüütilise konto aruandlus"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Aegunud analüütilised kontod"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Kogus"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Read arveldada"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analüütilised read arveldada"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Müügihind"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Analüütilised read - Aruandlus"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Kogus"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Analüütilised read arve aruandesse"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "Mõõtühik"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Minu igapäevased tööajakaardid konto järgi"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Tööajakaart kasutaja järgi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Tööajakaart konto järgi"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Tööajakaart konto järgi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Kulud arveldamiseks"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Minu kuu tööajakaart"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Juhuslikud tööajalehe read"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Tööajalehed"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Tööajakaardid konto kohta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Tääajakaardid arveldamiseks"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Tööajakaardid päeva kohta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Igapäevane tööajakaart konto järgi"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Tööajakaart konto kohta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Tööajaleht - Aruandlus"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Tööajakaart arveldamiseks"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Käesolev kuu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Minu tööajakaardid konto järgi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Juhuslik tööajalehe aruanne"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Juhuslikud tööajalehed"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Igapäevane tööajakaart konto järgi"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Juhuslikud tööajalehtede read"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Arveldada"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Tööajakaart kasutaja järgi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Tööajakaart arve järgi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Juhuslik tööajaleht"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Üldine konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Tööajakaart päeva kohta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Minu tööajakaardid arveldamiseks"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Igapäevane tööajakaart konto kohta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Moodul tööajalehe vaadete lisamiseks nagu nt\n"
+"    Kõik kuud, Tööajaleht kasutaja järgi, Kuu tööajaleht, Tööajaleht konto "
+"järgi"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Haldur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Tööajakaart kasutaja järgi (see kuu)"
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 72d875a57f7..f7efdb8b8ec 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -34,7 +34,7 @@ msgstr "Forcer l'utilisation d'un produit spécifique"
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du model invalide pour la définition de l'action."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -492,3 +492,295 @@ msgstr "Comptes Facturables Non Cloturés"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Coût"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Comptes analytiques à clôturer"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Quantité Max."
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Compte Analytique"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Echéance"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Rapports des Comptes Analytiques"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Comptes Analytiques Expirés"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Lignes analytique à facturer"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Prix de vente"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Rapport des lignes analytiques à facturer"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Mes feuilles de présence journalières par comptes"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Timesheets par utilisateur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Feuilles de Présence par Compte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Timesheet par compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Coûts à facturer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Mes feuilles de présence du mois"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Feuille de présence"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Feuille de présence par compte"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Timesheet à facturer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "feuille de présence par jour"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Feuilles de présences jounalière par Compte"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Feuilles de présence par compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Timesheets par facture"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Ce mois"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Mes feuilles de présence par compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Timesheet journalière par compte"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projet"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Feuilles de présences par Utilisateur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Feuilles de présence par Facture"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Feuille de présence par jour"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Mes feuilles de présence à facturer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Feuille de présence journalière par compte"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Feuille de présence par utilisateur (ce mois)"
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index 53e0dbc1de1..c8a62d12907 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -206,7 +206,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -307,10 +307,11 @@ msgid "Display date in the history of works"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.final.invoice.create,init,date:0
-#: wizard_field:hr.timesheet.invoice.create,init,date:0
+#: field:random.timesheet.lines,date:0 field:report.random.timesheet,date:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
@@ -343,9 +344,9 @@ msgid "End of period"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
@@ -395,6 +396,7 @@ msgstr ""
 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 !"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,employee_ids:0
@@ -417,9 +419,9 @@ msgid "Choose accounts you want to invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.create,init,product:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -437,9 +439,9 @@ msgid "Journal"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
 msgid "Units"
-msgstr ""
+msgstr "Jedinice"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -469,9 +471,9 @@ msgid "Types of invoicing"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:account.analytic.line,to_invoice:0
+#: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
@@ -480,8 +482,300 @@ msgid "Unclosed Invoiceable Accounts"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-#: wizard_field:hr.timesheet.final.invoice.create,init,price:0
-#: wizard_field:hr.timesheet.invoice.create,init,price:0
+#: field:report_timesheet.user,cost:0
 msgid "Cost"
+msgstr "Trošak"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Analitički konto koji treba zatvoriti"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Maks. količina"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Analitički Konto"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Rok"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Izvještaji analitike"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Zastarjela Analitička Konta"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Stavke za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analitičke stavke za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Prodajna cijena"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Analitičke stavke - Izvještavanje"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Analitičke stavke za ispis na fakturi"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Moji dnevni Rasporedi po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Raspored po Korisniku"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Raspored po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Raspored po Stranki"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Troškovi za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Moj raspored u mjesecu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Nasumični tokovi Rasporeda"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Rasporedi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Rasporedi po Stranki"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Rasporedi za obračun"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Rasporedi po danu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Dnevni Rasporedi po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Raspored po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Raspored - Izvještavanje"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Raspored za obračun"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Ovaj Mjesec"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Moji rasporedi prema Kupcu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Nasumičan izvještaj Rasporeda"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Nasumični Rasporedi"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Dnevni Raspored po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Nasumični tokovi Rasporeda"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Raspored po Korisniku"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Raspored prema Računu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Nasumičan Raspored"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Opći Račun Kupca"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Raspored po danu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Moji rasporedi za obračun"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Dnevni Raspored po Kupcu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
 msgstr ""
+"Modul koji dodaje poglede Rasporeda poput: Čitav Mjesec, Raspored prema "
+"Korisniku, Raspored Mjeseca, Raspored prema Kupcu"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Upravitelj"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Raspored prema Korisniku (Ovaj mjesec)"
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 35b924e3483..5cc494b703f 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -477,3 +477,298 @@ msgstr ""
 msgid "Cost"
 msgstr ""
 
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
+
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 53e0dbc1de1..f58f02e36d8 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 10e9f687cc1..852b6974489 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Bulan Ini"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 162dfe9a31c..09f58d45300 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -34,7 +34,7 @@ msgstr "Forza per usare un prodotto specifico"
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome di modulo non valido nella definizione dell'azione."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -494,3 +494,295 @@ msgstr "Contabilità Fatturabile non Chiusa"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Costo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Contabilità Analitica da Chiudere"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Quantità Massima"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Conto analitico"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Scadenza"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Relatório de Conta Analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Contabilità Analitiche Scadute"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Righe Analitiche da Fatturare"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Prezzo di Vendita"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Importo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Report Riche Analitiche da Fatturare"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "Unità di Misura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "I Miei Orari di Lavoro giornalieri da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Orari di Lavoro da Utente"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Orari di Lavoro da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Orari di Lavoro da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Costi da Fatturare"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "I Miei Orari di Lavoro del mese"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Orari di Lavoro"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Orari di Lavoro da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Orari di Lavoro da Fatturare"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Orari di Lavoro per giorno"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Orari di Lavoro giornalieri da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Orari di Lavoro da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Orari di Lavoro da Fattura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Questo Mese"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "I Miei Orari di Lavoro da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Orario di Lavoro giornaliero da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Progetto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Fa Fatturare"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Orari di Lavoro da Utente"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Orario di Lavoro da Fattura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Orari di Lavoro giornalieri"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "I Miei Orari di Lavoro da Fatturare"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Orari di Lavoro giornalieri da Contabilità"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Responsabile"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Orari di Lavoro da Utente (questo mese)"
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index 1e1d963dc10..cb76a3a2020 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -93,8 +93,9 @@ msgid ""
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
 msgstr ""
-"이 필드를 체크하면, 귀하의 플랜이 분석계정 (타임시트, 비용)의 비용에 기초하여 인보이스를 자동 생성합니다. 분석 계정 상의 자동 "
-"인보이스 요율을 구성할 수 있습니다."
+"이 필드를 체크하면, 귀하의 플랜이 분석계정 (타임시트, 비용)의 비용에 기초하"
+"여 인보이스를 자동 생성합니다. 분석 계정 상의 자동 인보이스 요율을 구성할 수 "
+"있습니다."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
@@ -249,7 +250,9 @@ msgstr "통화"
 msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
-msgstr "특정 상품을 사용하도록 하려면 이 필드를 완성하십시오. 원가로부터 도출되는 실제 상품을 이용하려면 비워 두십시오."
+msgstr ""
+"특정 상품을 사용하도록 하려면 이 필드를 완성하십시오. 원가로부터 도출되는 실"
+"제 상품을 이용하려면 비워 두십시오."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
@@ -489,54 +492,130 @@ msgstr "마감되지 않은 인보이스 대상 계정들"
 msgid "Cost"
 msgstr "원가"
 
-#, python-format
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "마감할 분석 계정"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "최대 수량"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "분석 계정"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "상태"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "마감시한"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "분석 계정 보고"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "파트너"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "시효소멸된 분석 계정들"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "수량"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "인보이스할 라인들"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "인보이스할 분석 라인들"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "판매 가격"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "분석 라인들 - 리포팅"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "월"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "금액"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "인보이스 리포트로의 분석 라인"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
 #~ msgid "Analytic account incomplete"
 #~ msgstr "불완전 분석 계정"
 
-#, python-format
 #~ msgid "Analytic Account incomplete"
 #~ msgstr "불완전 분석 계정"
 
-#, python-format
 #~ msgid "Partner incomplete"
 #~ msgstr "불완전 파트너"
 
-#, python-format
 #~ msgid "Data Insufficient!"
 #~ msgstr "데이터 부족 !"
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "에러!"
 
-#, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "인보이스된 분석 라인을 수정할 수는 없습니다."
 
-#, python-format
 #~ msgid "Invoices"
 #~ msgstr "인보이스"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "에러"
 
-#, python-format
 #~ msgid "Please fill in the Address field in the Partner: %s."
 #~ msgstr "파트너의 주소 필드를 채우십시오:%s"
 
-#, python-format
 #~ msgid "Balance product needed"
 #~ msgstr "필요한 밸런스 상품"
 
-#, python-format
 #~ msgid "No Records Found for Report!"
 #~ msgstr "리포트를 위한 레코드가 없음!"
 
-#, python-format
 #~ msgid "At least one line has no product !"
 #~ msgstr "한 라인 이상에 상품이 없습니다!"
 
-#, python-format
 #~ msgid "Please fill a Balance product in the wizard"
 #~ msgstr "위저드의 밸런스 상품을 기재하십시오."
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 53e0dbc1de1..f58f02e36d8 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index e3559e86cc7..b387579ba76 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -497,3 +497,297 @@ msgstr "Open facturabele rekeningen"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Kosten"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Te sluiten kostenplaatsen"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Max. hoeveelheid"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Kostenplaats"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Deadline"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Overzichten kostenplaatsen"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Verlopen kostenplaatsen"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Te factureren boekingen"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Te factureren kostenplaatsboekingen"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Verkoopprijs"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Kostenplaatsboekingen - Overzichten"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Bedrag"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Kostenplaatsboekingen naar factuuroverzicht"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "ME"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Mijn dagelijkse urenstaten per rekening"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Urenstaat per gebruiker"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Urenstaat op rekening"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Urenstaat per rekening"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Nog te ontvangen facturen"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Mijn urenstaat van de maand"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Willekeurige urenstaat regels"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Roosters"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Urenstaten per rekening"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Urenstaten voor facturatie"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Urenstaat per dag"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Dagelijkse urenstaat per rekening"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Urenstaat per rekening"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Urenstaat - Rapportage"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Urenstaat op factuur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Deze maand"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Mijn urenstaten op rekening"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Overzicht willekeurige urenstaat"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Willekeurige urenstaten"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Dagelijkse urenstaat op rekening"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Willekeurige urenstaat regels"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Project"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Naar factuur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Urenstaat op gebruiker"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Urenstaat op factuur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Willekeurige urenstaat"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Algemene rekening"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Urenstaat per dag"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Mijn urenstaten voor facturering"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Dagelijkse urenstaat per rekening"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Module om urenstaat presentaties toe te voegen zoals:\n"
+"     Alle maanden, per gebruiker, deze maand of per rekening"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Urenstaat op gebruiker (Deze maand)"
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index 56c717606a8..6282c785f79 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -486,3 +486,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 85f0ef623c1..4da79cbbfc0 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -494,3 +494,298 @@ msgstr "Nie zamknięte konta fakturowalne"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Koszt"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Konto analityczne do zamknięcia"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Maksymalna ilość"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Konto analityczne"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Stan"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Termin"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Raportowanie kont analitycznych"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Konta analityczne przeterminowane"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Pozycje do fakturowania"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Pozycje analityczne do zafakturowania"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Cena sprzedaży"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Raportowanie - Pozycje analityczne"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Kwota"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Raport pozycji analitycznych do zafakturowania"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Moja dzienne karty czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Karty czasu pracy wg użytkownika"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Karta czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Karta czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Koszty do faktury"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Moja karta czasu pracy w miesiącu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Przypadkowe pozycje karty czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Karty czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Karty czasu pracy na konto"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Karta czasu pracy do zafakturowania"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Karty czasu pracy na dni"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Dzienna karta czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Karta czasu pracy na konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Karta czasu pracy - Raportowanie"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Karta czasu pracy wg faktur"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "W tym miesiącu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Moje karty czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Raport przypadkowych kart czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "Przypadkowe karty czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Dzienna karta czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Pozycje przypadkowych kart czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Do zafakturowania"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Karta czasu pracy wg użytkownika"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Karta czasu pracy wg faktury"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Przypadkowa karta czasu pracy"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Konto ogólne"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Karta czasu pracy na dzień"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Moje karty czasu pracy do zafakturowania"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Dzienna karta czasu pracy na konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+"Moduł do dodawania widoków karty czasu pracy jak\n"
+"    Wszystkie miesiące, Karta czasu pracy wg użytkownika, Karta czasu pracy "
+"miesiąca, Karta czasu pracy wg konta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Menedżer"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Karta czasu pracy wg użytkownika (ten miesiąc)"
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 5fbf067a9cc..e35fc1f9715 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -486,3 +486,295 @@ msgstr "Contas facturáveis não fechadas"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Custo"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Conta da contabilidade analítica a fechar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Quantidade máxima"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+msgid "Analytic account"
+msgstr "Conta da contabilidade analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Prazo limite"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Terceiro"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "onta da contabilidade analítica expirado"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Linhas analíticas a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Preço de venda"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Montante"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Relatório das linhas analíticas a facturar"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Meus horários diários por conta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Horário por utilizador"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Horário por conta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Horário por conta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Custos a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Meu horário do mês"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Horários"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Horários por conta"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Horário a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Horários por dia"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Horário diário por conta"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Horário por conta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Horário por factura"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Este mês"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Meus horários por conta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Horário diários por conta"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projecto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "A facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Horário por utilizador"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Horários por facturação"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Horários por dia"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Meus horários a facturar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Horário diário por conta"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Conta da contabilidade analítica"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Gestor"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Horário por utilizador (este mês)"
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 9bbc1056169..7304ed718c2 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # translation of pt_BR.po to
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -488,3 +488,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index 55366aaf7ed..1f12bb1fe06 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index e39a7e123a9..deaef481ad7 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -487,3 +487,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Стоимость"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Счет аналитики к закрытию"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Макс. кол-во"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+msgid "Analytic account"
+msgstr "Счет аналитики"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Состояние"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Срок"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Истекшие счета аналитики"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Позиции аналитики к выставлению счетов"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Цена продажи"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Сумма"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Отчет по позициям аналитики к выставлению счетов"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "Ед. изм."
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Мои дневные табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Табель по пользователям"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Табель по счетам"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Табель по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Расходы для выставления счетов"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Мой табель за месяц"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Табели"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Табели для выставления счетов"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Табели по дням"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Дневной табель по счетам"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Табиль по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Данный месяц"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Мои табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Дневные табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Выставить счет"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Табель по пользователям"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Табели по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Табель по дням"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Мои табели для выставления счетов"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Дневной табель по счетам"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Счет аналитики"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Начальник"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Табель по пользователям (тек.мес.)"
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 081a79a0fa8..b2b2f8cc19e 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -486,3 +486,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Strošek"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Zapreti analitični konto"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Najv. količina"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Analitični konto"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Rok"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Poročanje po analitičnih kontih"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Neveljavni analitični konti"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Vrstice za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Analitične vrstice za fakturiranje"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Prodajna cena"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "Analitične vrstice - Poročanje"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Analitične vrstice za poročilo fakturiranja"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "ME"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Moje dnevne časovnice po strankah"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Časovnice po uporabnikih"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Časovnice po kontih"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Časovnice po kontih"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Zaračunavanje stroškov"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Časovnice"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Časovnice po strankah"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Zaračunavanje po časovnicah"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Časovnice po dneh"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Dnevna časovnica po stranki"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Časovnica po stranki"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Časovnice - poročanje"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Časovnica po računu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Za zaračunavanje"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Časovnica po računu"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Splošni konto"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Upravitelj"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 1e245855dd1..6a6a302e374 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -486,3 +486,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index 24961ec76ee..997a4492f65 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index f82fefbd548..8056a10ec1b 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -485,3 +485,295 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Max. Miktar"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Analiz Hesabı"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Son Teslim Tarihi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Ortak"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Faturalanacak Kalemler"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Fatura Analitik Kalemleri"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Satış Fiyatı"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Miktar"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Fatura Raporu Analitik Kalemleri"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "Birim"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Günlük Zaman Tablosu Hesabım"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Faturalanacak Maliyetler"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Aylık Giriş-Çıkışlarım"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Saat girişleri"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Hesaba Göre Günlük Giriş Çıkış"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Açıklama"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "Zaman Tablosu - Raporlama"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Bu Ay"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Giriş-Çıkış Hesabım"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Kullanıcı"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Proje"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "Fatura Adresi"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "Genel Hesap"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Faturalanacak Giriş-Çıkışlarım"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Yönetici"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index 22e99a60e68..d398e7f6054 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -486,3 +486,295 @@ msgstr "Незакриті рахунки для інвойсування"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Витрати"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Аналітичний рахунок до закриття"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Макс. кількість"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+msgid "Analytic account"
+msgstr "Аналітичний рахунок"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Стан"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Кінцевий термін"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Застарілі аналітичні рахунки"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "Кількість"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Аналітичні рядки Рахунку-Фактури"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Ціна продажу"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "Місяць"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "Рядки аналітики до звіту з накладних"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "ОВ"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "Мої щоденні табелі за рахунком"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Табель користувачів"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "Табель за рахунками"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Щоденний табель за рахунком"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Кошти для інвойсування"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "Мій табель за місяць"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Табелі"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "Табелі за рахунками"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Табель за накладними"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "Табелі за днями"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "Щоденний табель за рахунками"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Табель за рахунком"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Табель за накладними"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "Цей місяць"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "Мої табелі за рахунком"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "Користувач"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Щоденний табель за рахунком"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "На виписку"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "Табель за користувачами"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "Табель за накладними"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Табель за днем"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "Мої табелі на оформлення"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Щоденний табель за рахунком"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Аналітичний рахунок"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "Менеджер"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "Табель за користувачами (цей місяць)"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 9a14e29ccb3..67162b3ba0c 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -91,7 +91,9 @@ msgid ""
 "Check this field if you plan to automatically generate invoices based on the "
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
-msgstr "如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设定自动发票的辅助核算项目"
+msgstr ""
+"如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设"
+"定自动发票的辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
@@ -486,10 +488,302 @@ msgstr "未关闭的可开票项目"
 msgid "Cost"
 msgstr "成本"
 
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "辅助核算项关闭"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "最大数量"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "辅助核算项"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "截止期限"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "辅助核算项报表"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "过期的辅助核算项"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "辅助核算开发票"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "辅助核算的发票"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "售价"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr "辅助核算 - 报表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "金额"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "辅助核算开的发票报表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "计量单位"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
+msgid "My daily timesheets by account"
+msgstr "我的科目每天时间表"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "用户时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
+msgid "Timesheet by Account"
+msgstr "科目时间表"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "科目时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "成本开发票"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
+msgid "My Timesheet of the Month"
+msgstr "我的月度时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
+#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "任意时间表明细"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "每科目时间表"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "时间表开发票"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "每天时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
+msgid "Daily Timesheet by Account"
+msgstr "科目每日时间表"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "说明"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "每科目时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
+msgid "Timesheet - Reporting"
+msgstr "时间表 - 报表"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "发票时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
+msgid "This Month"
+msgstr "本月"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
+msgid "My timesheets by account"
+msgstr "我的科目时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "任意时间表报表"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,user_id:0
+#: field:report.random.timesheet,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+msgstr "任意时间表"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "科目每日时间表"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "任意时间表明细"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "项目"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "开发票"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
+msgid "Timesheet by User"
+msgstr "用户时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
+msgid "Timesheet by Invoice"
+msgstr "发票时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "任意时间表"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,general_account_id:0
+msgid "General Account"
+msgstr "一般科目"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "每天时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
+msgid "My timesheets to invoice"
+msgstr "我的时间表开发票"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "科目每日时间表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:report_timesheet.module_meta_information
+msgid ""
+"Module to add timesheet views like\n"
+"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间表,科目时间表"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项目"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "管理者"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
+#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
+msgid "Timesheet by user (this month)"
+msgstr "用户时间表(这月)"
+
 #~ msgid ""
 #~ "\n"
-#~ "Module to generate invoices based on costs (human resources, expenses, "
-#~ "...).\n"
+#~ "Module to generate invoices based on costs (human resources, "
+#~ "expenses, ...).\n"
 #~ "You can define price lists in analytic account, make some theoretical "
 #~ "revenue\n"
 #~ "reports, eso."
@@ -500,3 +794,9 @@ msgstr "成本"
 
 #~ msgid "Invoice on analytic entries"
 #~ msgstr "辅助核算凭证发票"
+
+#~ msgid "A report on analytic lines, costs by products, months and accounts."
+#~ msgstr "辅助核算明细的报表:产品成本,月度和科目"
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index 3084f03f2b9..43583228894 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet_invoice
+# 	* hr_timesheet_invoice
 #
 msgid ""
 msgstr ""
@@ -485,3 +485,92 @@ msgstr ""
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Analytic lines - Reporting"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr ""
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 c9fed4d3e33..58215a087b7 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
@@ -490,7 +490,7 @@
             <field name="search_view_id" ref="view_random_timesheet_lines_search"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem
+<!--         <menuitem
                 icon="terp-project"
                 id="base.menu_main_pm"
                 name="Project"
@@ -504,14 +504,14 @@
                 action="action_random_timesheet_lines_board"
                 id="menu_project_management_timesheet_lines_board"
                 parent="base.menu_project_management_time_tracking"
-                sequence="7"/>
+                sequence="7"/-->
       <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
-            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
-        <menuitem
+            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+           <menuitem
                 action="action_random_timesheet_lines_board"
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager" sequence="2"/>
+                groups="hr.group_hr_manager" sequence="2"/>-->
     </data>
 </openerp>
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 651edf9b2b1..87648a61642 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
@@ -7,19 +7,21 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Timesheet Profit">
-			    <group col="4" colspan="6">
-		    	    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <field name="journal_ids" colspan="4"/>
-				    <field name="employee_ids" colspan="4"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
-				</group>
-			</form>
+				<form string="Timesheet Profit">
+					<group height="340" width="480">
+						<group col="4" colspan="6">
+							<field name="date_from"/>
+							<field name="date_to"/>
+							<field name="journal_ids" colspan="4"/>
+							<field name="employee_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group col="2" colspan="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index bab9e1ff8e5..cf23ae129cd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -30,7 +30,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_timesheet_invoice_cost_ledger_values">
+<!-- 		<record model="ir.values" id="hr_timesheet_invoice_cost_ledger_values">
             <field name="model_id" ref="model_account_analytic_account" />
             <field name="object" eval="1" />
             <field name="name">Cost Ledger</field>
@@ -38,7 +38,7 @@
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_cost_ledger'))" />
             <field name="key">action</field>
             <field name="model">account.analytic.account</field>
-        </record>
+        </record> -->
 
 	</data>
 </openerp>
\ No newline at end of file
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 e619df22683..a5b2e35622c 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -109,7 +109,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
             last_invoice = self.pool.get('account.invoice').create(cr, uid, curr_invoice)
             invoices.append(last_invoice)
 
-            context2=context.copy()
+            context2 = context.copy()
             context2['lang'] = partner.lang
             cr.execute("SELECT product_id, to_invoice, sum(unit_amount) " \
                     "FROM account_analytic_line as line " \
@@ -158,7 +158,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 #
                 # Compute for lines
                 #
-                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s", (account.id, tuple(data['ids']), product_id, factor_id))
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(data['ids']), product_id, factor_id))
 
                 line_ids = cr.dictfetchall()
                 note = []
@@ -169,7 +169,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                         details.append(line['date'])
                     if data['time']:
                         if line['product_uom_id']:
-                            details.append("%s %s" % (line['unit_amount'], self.pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
+                            details.append("%s %s" % (line['unit_amount'], self.pool.get('product.uom').browse(cr, uid, [line['product_uom_id']],context2)[0].name))
                         else:
                             details.append("%s" % (line['unit_amount'], ))
                     if data['name']:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 7ddf3bc99a7..d71b385c1f8 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,27 +8,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Invoice analytic lines">
-			    <group col="4" colspan="6">
-			        <notebook>
-			        <page string="Billing Data">
-			            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-			            <field name="date"/>
-			            <field name="time"/>
-			            <field name="name"/>
-			            <field name="price"/>
-			            <separator string="Force to use a specific product" colspan="4"/>
-			            <field name="product"/>
-			        </page>
-			        <page string="Filter on Accounts" groups="base.group_extended">
-			            <separator string="Choose accounts you want to invoice" colspan="4"/>
-			            <field name="accounts" colspan="4" nolabel="1"/>
-			        </page>
-			        </notebook>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+			    <group height="280" width="450">
+				    <group col="4" colspan="6">
+				        <notebook>
+				        <page string="Billing Data">
+				            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+				            <field name="date"/>
+				            <field name="time"/>
+				            <field name="name"/>
+				            <field name="price"/>
+				            <separator string="Force to use a specific product" colspan="4"/>
+				            <field name="product"/>
+				        </page>
+				        <page string="Filter on Accounts" groups="base.group_extended">
+				            <separator string="Choose accounts you want to invoice" colspan="4"/>
+				            <field name="accounts" colspan="4" nolabel="1"/>
+				        </page>
+				        </notebook>
+					</group>
+					<separator colspan="4"/>
+				    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 4c285a7a0a7..3c359952022 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -21,5 +21,6 @@
 
 import idea
 import wizard
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index f10a00c75e2..d2b854ba0b5 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -39,6 +39,7 @@
         'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
+        'report/report_vote_view.xml',
         'security/idea_security.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 6b728560277..0160d228248 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -149,20 +149,6 @@
         <field name="arch" type="xml">
             <search string="Ideas vote">
                 <group col="10" colspan="4">
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="    7 Days    "
-                         name="week"
-                         separator="1"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Tasks during last 7 days"/>
-                    <separator orientation="vertical"/>
                     <field name="idea_id" widget="selection"/>
                     <field name="user_id" string="User"/>
                 </group>
@@ -385,10 +371,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_idea_vote_search"/>
-        <field name="context">{'search_default_week':1}</field>
     </record>
 
-    <menuitem name="Votes" parent="menu_idea_reporting" id="menu_idea_vote" action="action_idea_vote"/>
+    <menuitem name="Votes" parent="menu_ideas1" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
 </openerp>
diff --git a/addons/idea/report/__init__.py b/addons/idea/report/__init__.py
new file mode 100644
index 00000000000..91cacda571a
--- /dev/null
+++ b/addons/idea/report/__init__.py
@@ -0,0 +1,23 @@
+# -*- 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 report_vote
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py
new file mode 100644
index 00000000000..2751450129c
--- /dev/null
+++ b/addons/idea/report/report_vote.py
@@ -0,0 +1,78 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class report_vote(osv.osv):
+    _name = "report.vote"
+    _description = "Idea Vote Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date Order', readonly=True),
+        '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'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'user_id': fields.many2one('res.users', 'User Name'),
+        'score': fields.integer('Score'),
+        'idea_id': fields.many2one('idea.idea', 'Idea'),
+        'nbr':fields.integer('# of Lines', readonly=True),
+        'idea_state': fields.selection([('draft', 'Draft'),('open', 'Opened'),
+                            ('close', 'Accepted'),
+                            ('cancel', 'Cancelled')],
+                            'State'),
+        'category_id': fields.many2one('idea.category', 'Category'),
+        'creater_id': fields.many2one('res.users', 'User Name'),
+
+        }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_vote')
+        cr.execute("""
+            create or replace view report_vote as (
+               select
+                    min(iv.id) as id,
+                    count(*) as nbr,
+                    to_date(to_char(iv.date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    to_char(iv.date, 'YYYY') as year,
+                    to_char(iv.date, 'MM') as month,
+                    to_char(iv.date, 'YYYY-MM-DD') as day,
+                    iv.user_id as user_id,
+                    iv.idea_id as idea_id,
+                    ii.state as idea_state,
+                    ii.user_id as creater_id,
+                    ii.category_id,
+                    (sum(CAST(iv.score as integer))/count(iv.*)) as score
+                from
+                    idea_vote as iv
+                    left join idea_idea as ii on (ii.id = iv.idea_id)
+                group by
+                    iv.id ,to_char(iv.date, 'dd-MM-YYYY'),to_char(iv.date, 'YYYY'),
+                    to_char(iv.date, 'MM'),to_char(iv.date, 'YYYY-MM-DD'),ii.state,
+                    iv.user_id,ii.user_id,ii.category_id,iv.idea_id
+            )
+            """)
+report_vote()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
new file mode 100644
index 00000000000..d2a4006a7e0
--- /dev/null
+++ b/addons/idea/report/report_vote_view.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_report_vote_tree" model="ir.ui.view">
+            <field name="name">report.vote.tree</field>
+            <field name="model">report.vote</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Idea Vote Analysis">
+                    <field name="date" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="idea_id" invisible="1"/>
+                    <field name="idea_state"/>
+                    <field name="creater_id" invisible="1"/>
+                    <field name="category_id" invisible="1"/>
+                    <field name="nbr" sum="# of Lines"/>
+                    <field name="score" sum="Score"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_report_vote_search" model="ir.ui.view">
+            <field name="name">report.vote.search</field>
+            <field name="model">report.vote</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Idea Vote Analysis">
+                    <group>
+                        <filter icon="terp-go-year" string="  365 Days  "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                            help="Idea Vote created last 365 days"/>
+                        <filter icon="terp-go-month" string="   30 Days   "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Idea Vote created in last 30 days"/>
+                        <filter icon="terp-go-week"
+                             string="    7 Days    "
+                             separator="1"
+                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                             help="Idea Vote created last 7 days"/>
+                        <separator orientation="vertical"/>
+                         <filter icon="terp-go-today"
+                             string="    Today    "
+                             name="today"
+                             separator="1"
+                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
+                             help="Idea Vote created by today"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test"
+                            string="Open"
+                            domain="[('idea_state','=',('open'))]"/>
+                        <filter icon="terp-camera_test"
+                            string="Accepted"
+                            domain="[('idea_state','=',('close'))]"/>
+                        <filter icon="terp-gtk-stop"
+                            string="Refused"
+                            domain="[('idea_state','=',('cancel'))]"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="10" col="12">
+                        <filter string="Idea" icon="terp-personal" context="{'group_by':'idea_id'}"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                        <filter string="Creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'idea_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_report_vote_all" model="ir.actions.act_window">
+            <field name="name">Idea Vote Analysis</field>
+            <field name="res_model">report.vote</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="search_view_id" ref="view_report_vote_search"/>
+            <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        </record>
+
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1"/>
+    </data>
+</openerp>
+
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 0fe5dad9ac9..a3d2b1a35c9 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -4,6 +4,5 @@
 "access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
 "access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
 "access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
-"idea_post_vote","idea.post.vote","model_idea_post_vote","base.group_user",1,1,1,1
 "access_idea_select","idea.select","model_idea_select","base.group_user",1,1,1,1
 "access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index f26f7ea2560..05b1119c4a4 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -32,6 +32,7 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'knowledge_installer.xml',
+        'knowledge_view.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
new file mode 100644
index 00000000000..9739450006f
--- /dev/null
+++ b/addons/knowledge/knowledge_view.xml
@@ -0,0 +1,10 @@
+<openerp>
+<data>
+    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document" sequence="19"/>
+    <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+
+    <menuitem id="knowledge.menu_document2" name="Collaborative Content"
+       parent="knowledge.menu_document" />
+
+</data>
+</openerp>
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index 9abb2d03be7..0343f29f43a 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_knowledge_installer","knowledge.installer","model_knowledge_installer",base.group_system,1,1,1,1
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index 04d498b5785..0343f29f43a 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,6 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_vat_listing_clients","vat.listing.clients","model_vat_listing_clients",account.group_account_user,1,1,1,1
-"access_partner_vat_intra","partner.vat.intra","model_partner_vat_intra",account.group_account_user,1,1,1,1
-"access_partner_vat","partner.vat","model_partner_vat",account.group_account_user,1,1,1,1
-"access_partner_vat_list","partner.vat.list","model_partner_vat_list",account.group_account_user,1,1,1,1
-"access_l1on_be_vat_declaration","l1on_be.vat.declaration","model_l1on_be_vat_declaration",account.group_account_user,1,1,1,1
diff --git a/addons/l10n_ch/security/ir.model.access.csv b/addons/l10n_ch/security/ir.model.access.csv
index 51af6ece8a9..0343f29f43a 100644
--- a/addons/l10n_ch/security/ir.model.access.csv
+++ b/addons/l10n_ch/security/ir.model.access.csv
@@ -1,3 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"account_journal_todo","account.journal.todo","model_account_journal_todo","base.group_system",1,1,1,1
-"account_journal_todo_erp","account.journa.todo","model_account_journal_todo","base.group_erp_manager",1,1,1,1
\ No newline at end of file
diff --git a/addons/l10n_ch_chart_c2c_pcg/security/ir.model.access.csv b/addons/l10n_ch_chart_c2c_pcg/security/ir.model.access.csv
index 517b4a1dddb..0343f29f43a 100644
--- a/addons/l10n_ch_chart_c2c_pcg/security/ir.model.access.csv
+++ b/addons/l10n_ch_chart_c2c_pcg/security/ir.model.access.csv
@@ -1,3 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"account_tax_todo","account.tax.template.todo","model_account_tax_template_todo","base.group_system",1,1,1,1
-"account_tax_todo_erp","account.tax.template.todo","model_account_tax_template_todo","base.group_erp_manager",1,1,1,1
\ No newline at end of file
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 24651cc3e3d..eee4e846d07 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:57+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-01 09:07+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -43,7 +43,7 @@ msgstr "Ingreso"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
 msgid "Tax"
-msgstr "Contribución"
+msgstr "Impuesto"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 5af63e329fd..bd5ca5df0d5 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -5,6 +5,3 @@
 "access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove","base.group_user",1,1,1,1
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
-"lunch_order_confirm ","lunch.order.confirm","model_lunch_order_confirm","base.group_user",1,1,1,1
-"lunch_order_cancel","lunch.order.cancel","model_lunch_order_cancel","base.group_user",1,1,1,1
-"lunch_cashbox_clean","lunch.cashbox.clean","model_lunch_cashbox_clean","base.group_user",1,1,1,1
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 3ccde181883..2c778241daf 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -29,6 +29,7 @@ import base64
 import re
 from tools.translate import _
 import logging
+import xmlrpclib
 
 _logger = logging.getLogger('mailgate')
 
@@ -68,8 +69,9 @@ class mailgate_thread(osv.osv):
     def msg_send(self, cr, uid, id, *args, **argv):
         raise Exception, _('Method is not implemented')
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
-                    email_from=False, message_id=False, references=None, attach=None, context=None):
+    def history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
+                    email_from=False, message_id=False, references=None, attach=None, email_cc=None, \
+                    email_bcc=None, email_date=None, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -77,8 +79,12 @@ class mailgate_thread(osv.osv):
         @param cases: a browse record list
         @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
         @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email address if any
-        @param details: Details of case history if any 
+        @param email: Email-To / Recipient address
+        @param email_from: Email From / Sender address if any
+        @param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
+        @param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
+        @param email_date: Email Date string if different from now, in server Timezone
+        @param details: Description, Ddtails of case history if any
         @param atach: Attachment sent in email
         @param context: A standard dictionary for contextual values"""
         if context is None:
@@ -96,38 +102,42 @@ class mailgate_thread(osv.osv):
 
         for case in cases:
             data = {
-                'name': keyword, 
-                'user_id': uid, 
-                'model' : case._name, 
-                'res_id': case.id, 
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                'message_id': message_id, 
+                'name': keyword,
+                'user_id': uid,
+                'model' : case._name,
+                'res_id': case.id,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'message_id': message_id,
             }
             attachments = []
             if history:
                 for att in attach:
                     attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
+                    
+                for param in (email, email_cc, email_bcc):
+                    if isinstance(param, list):
+                        param = ", ".join(param)
 
                 data = {
-                    'name': subject or 'History', 
-                    'history': True, 
-                    'user_id': uid, 
-                    'model' : case._name, 
+                    'name': subject or 'History',
+                    'history': True,
+                    'user_id': uid,
+                    'model' : case._name,
                     'res_id': case.id,
-                    'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                    'description': details or (hasattr(case, 'description') and case.description or False), 
-                    'email_to': email or \
-                        (hasattr(case, 'user_id') and case.user_id and case.user_id.address_id and \
-                         case.user_id.address_id.email) or tools.config.get('email_from', False), 
+                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'description': details or (hasattr(case, 'description') and case.description or False),
+                    'email_to': email,
                     'email_from': email_from or \
                         (hasattr(case, 'user_id') and case.user_id and case.user_id.address_id and \
-                         case.user_id.address_id.email) or tools.config.get('email_from', False), 
-                    'partner_id': hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False, 
-                    'references': references, 
-                    'message_id': message_id, 
+                         case.user_id.address_id.email),
+                    'email_cc': email_cc,
+                    'email_bcc': email_bcc,
+                    'partner_id': hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False,
+                    'references': references,
+                    'message_id': message_id,
                     'attachment_ids': [(6, 0, attachments)]
                 }
-            res = obj.create(cr, uid, data, context)
+            obj.create(cr, uid, data, context=context)
         return True
 mailgate_thread()
 
@@ -139,25 +149,33 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'id desc'
     _columns = {
-        'name':fields.char('Subject', size=128), 
-        'model': fields.char('Object Name', size=128), 
-        'res_id': fields.integer('Resource ID'),
+        'name':fields.text('Subject'),
+        'model': fields.char('Object Name', size=128, select=1),
+        'res_id': fields.integer('Resource ID', select=1),
         'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date'), 
+        'date': fields.datetime('Date'),
         'history': fields.boolean('Is History?'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
-        'message': fields.text('Description'), 
-        'email_from': fields.char('Email From', size=84), 
-        'email_to': fields.char('Email To', size=84), 
-        'email_cc': fields.char('Email CC', size=84), 
-        'email_bcc': fields.char('Email BCC', size=84), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'message': fields.text('Description'),
+        'email_from': fields.char('From', size=128, help="Email From"),
+        'email_to': fields.text('To', help="Email Recipients"),
+        'email_cc': fields.text('Cc', help="Carbon Copy Email Recipients"),
+        'email_bcc': fields.text('Bcc', help='Blind Carbon Copy Email Recipients'),
         'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="Referencess emails."),
-        'description': fields.text('Description'), 
-        'partner_id': fields.many2one('res.partner', 'Partner', required=False), 
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), 
+        'references': fields.text('References', readonly=True, help="References emails."),
+        'description': fields.text('Description'),
+        'partner_id': fields.many2one('res.partner', 'Partner', required=False),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
     }
 
+    def init(self, cr):
+        cr.execute("""SELECT indexname
+                      FROM pg_indexes
+                      WHERE indexname = 'mailgate_message_res_id_model_idx'""")
+        if not cr.fetchone():
+            cr.execute("""CREATE INDEX mailgate_message_res_id_model_idx
+                          ON mailgate_message (model, res_id)""")
+
 mailgate_message()
 
 class mailgate_tool(osv.osv_memory):
@@ -165,21 +183,11 @@ class mailgate_tool(osv.osv_memory):
     _name = 'email.server.tools'
     _description = "Email Server Tools"
 
-    def _to_decode(self, s, charsets):
-        if not s:
-            return s
-        for charset in charsets:
-            if charset:
-                try:
-                    return s.decode(charset)
-                except UnicodeError:
-                    pass
-        return s.decode('latin1')
-
     def _decode_header(self, text):
+        """Returns unicode() string conversion of the the given encoded smtp header"""
         if text:
-            text = decode_header(text.replace('\r', '')) 
-        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), text or []))
+            text = decode_header(text.replace('\r', ''))
+            return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
     def to_email(self,text):
         return re.findall(r'([^ ,<@]+@[^> ,]+)',text)
@@ -211,61 +219,68 @@ class mailgate_tool(osv.osv_memory):
                         'message_id': msg.get('message-id'), 
                         'references': msg.get('references'), 
                         'res_id': res_id,
-                        'user_id': uid, 
+                        'user_id': uid,
                         'attachment_ids': [(6, 0, attach)]
             }
-            msg_id = msg_pool.create(cr, uid, msg_data, context=context)
+            msg_pool.create(cr, uid, msg_data, context=context)
         return True
 
-    def email_forward(self, cr, uid, model, res_ids, msg,  email_error=False):
+    def email_forward(self, cr, uid, model, res_ids, msg, email_error=False, context=None):
         """Sends an email to all people following the thread
-        @param res_id: Id of the record of OpenObject model created from the Email details 
-        @param msg: Email details
+        @param res_id: Id of the record of OpenObject model created from the email message
+        @param msg: email.message.Message to forward
         @param email_error: Default Email address in case of any Problem
         """
-        for res_id in res_ids:
-            history_pool = self.pool.get('mailgate.message')
-            message = email.message_from_string(tools.ustr(msg).encode('utf-8'))
-            encoding = message.get_content_charset()
-            message['body'] = message.get_payload(decode=True)
-            if encoding:
-                message['body'] = self._to_decode(message['body'], [encoding])
-            subject = message['Subject']
+        model_pool = self.pool.get(model)
 
-            from_email = self._decode_header(message['From'])
-
-            model_pool = self.pool.get(model)
-            message_followers = model_pool.message_followers(cr, uid, [res_id])[res_id]
+        for res in model_pool.browse(cr, uid, res_ids, context=context):
+            message_followers = model_pool.message_followers(cr, uid, [res.id])[res.id]
             message_followers_emails = self.to_email(','.join(message_followers))
-
-            message_recipients = self.to_email(','.join([from_email,self._decode_header(message['To']),self._decode_header(message['Cc'])]) )
+            message_recipients = self.to_email(','.join(filter(None,
+                                                         [self._decode_header(msg['from']),
+                                                         self._decode_header(msg['to']),
+                                                         self._decode_header(msg['cc'])])))
             message_forward = [i for i in message_followers_emails if (i and (i not in message_recipients))]
 
-            res = None
-            try:
-                res = tools.email_send(from_email, message_forward, subject, body, openobject_id=res_id)
-            except Exception, e:
-                if email_error:
-                    temp_msg = '[%s] %s'%(res_id, message['Subject'])
-                    del message['Subject']
-                    message['Subject'] = '[OpenERP-Error] %s' %(temp_msg)
-                    tools.email_send(from_email, email_error, message.get('Subject'), message.get('body'), openobject_id=res_id)
+            if message_forward:
+                # TODO: we need an interface for this for all types of objects, not just leads
+                if hasattr(res, 'section_id'):
+                    del msg['reply-to']
+                    msg['reply-to'] = res.section_id.reply_to
+
+                smtp_from = self.to_email(msg['from'])
+                if not tools.misc._email_send(smtp_from, message_forward, msg, openobject_id=res.id) and email_error:
+                    subj = msg['subject']
+                    del msg['subject'], msg['to'], msg['cc'], msg['bcc']
+                    msg['subject'] = '[OpenERP-Forward-Failed] %s' % subj
+                    msg['to'] = email_error
+                    tools.misc._email_send(smtp_from, self.to_email(email_error), msg, openobject_id=res.id)
 
     def process_email(self, cr, uid, model, message, attach=True, context=None):
-        """This function Processes email and create record for given OpenERP model 
+        """This function Processes email and create record for given OpenERP model
         @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 model: OpenObject Model
-        @param message: Email details
+        @param message: Email details, passed as a string or an xmlrpclib.Binary
         @param attach: Email attachments
         @param context: A standard dictionary for contextual values"""
-        model_pool = self.pool.get(model)
+
+        # extract message bytes, we are forced to pass the message as binary because
+        # we don't know its encoding until we parse its headers and hence can't
+        # convert it to utf-8 for transport between the mailgate script and here.
+        if isinstance(message, xmlrpclib.Binary):
+            message = str(message.data)
+
         if not context:
             context = {}
+
+        model_pool = self.pool.get(model)
         res_id = False
+
         # Create New Record into particular model
         def create_record(msg):
+            att_ids = []
             if hasattr(model_pool, 'message_new'):
                 res_id = model_pool.message_new(cr, uid, msg, context)
             else:
@@ -280,7 +295,6 @@ class mailgate_tool(osv.osv_memory):
                 data.update(self.get_partner(cr, uid, msg.get('from'), context=context))
                 res_id = model_pool.create(cr, uid, data, context=context)
 
-                att_ids = []
                 if attach:
                     for attachment in msg.get('attachments', []):
                         data_attach = {
@@ -293,20 +307,20 @@ class mailgate_tool(osv.osv_memory):
                         }
                         att_ids.append(self.pool.get('ir.attachment').create(cr, uid, data_attach))
 
-            return res_id
-
-        history_pool = self.pool.get('mailgate.message')
+            return res_id, att_ids
 
         # Warning: message_from_string doesn't always work correctly on unicode,
         # we must use utf-8 strings here :-(
-        msg_txt = email.message_from_string(tools.ustr(message).encode('utf-8'))
-        message_id = msg_txt.get('Message-ID', False)
+        if isinstance(message, unicode):
+            message = message.encode('utf-8')
+        msg_txt = email.message_from_string(message)
+        message_id = msg_txt.get('message-id', False)
         msg = {}
 
         if not message_id:
             # Very unusual situation, be we should be fault-tolerant here
             message_id = time.time()
-            msg_txt['Message-ID'] = message_id
+            msg_txt['message-id'] = message_id
             _logger.info('Message without message-id, generating a random one: %s', message_id)
 
         fields = msg_txt.keys()
@@ -325,14 +339,14 @@ class mailgate_tool(osv.osv_memory):
         if 'Delivered-To' in fields:
             msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
 
-        if 'Cc' in fields:
-            msg['cc'] = self._decode_header(msg_txt.get('Cc'))
+        if 'CC' in fields:
+            msg['cc'] = self._decode_header(msg_txt.get('CC'))
 
-        if 'Reply-To' in fields:
+        if 'Reply-to' in fields:
             msg['reply'] = self._decode_header(msg_txt.get('Reply-To'))
 
         if 'Date' in fields:
-            msg['date'] = msg_txt.get('Date')
+            msg['date'] = self._decode_header(msg_txt.get('Date'))
 
         if 'Content-Transfer-Encoding' in fields:
             msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
@@ -341,49 +355,49 @@ class mailgate_tool(osv.osv_memory):
             msg['references'] = msg_txt.get('References')
 
         if 'X-Priority' in fields:
-            msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0]
+            msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
 
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('Content-Type', ''):
             encoding = msg_txt.get_content_charset()
-            msg['body'] = msg_txt.get_payload(decode=True)
-            if encoding:
-                msg['body'] = tools.ustr(msg['body'])
+            body = msg_txt.get_payload(decode=True)
+            msg['body'] = tools.ustr(body, encoding)
 
         attachments = {}
+        has_plain_text = False
         if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
             body = ""
-            counter = 1
             for part in msg_txt.walk():
                 if part.get_content_maintype() == 'multipart':
                     continue
 
                 encoding = part.get_content_charset()
-
+                filename = part.get_filename()
                 if part.get_content_maintype()=='text':
                     content = part.get_payload(decode=True)
-                    filename = part.get_filename()
-                    if filename :
+                    if filename:
                         attachments[filename] = content
-                    else:
-                        if encoding:
-                            content = unicode(content, encoding)
+                    elif not has_plain_text:
+                        # main content parts should have 'text' maintype
+                        # and no filename. we ignore the html part if
+                        # there is already a plaintext part without filename,
+                        # because presumably these are alternatives.
+                        content = tools.ustr(content, encoding)
                         if part.get_content_subtype() == 'html':
-                            body = tools.html2plaintext(content)
+                            body = tools.ustr(tools.html2plaintext(content))
                         elif part.get_content_subtype() == 'plain':
                             body = content
-                elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
-                    filename = part.get_filename();
+                            has_plain_text = True
+                elif part.get_content_maintype() in ('application', 'image'):
                     if filename :
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)
-                        if encoding:
-                            res = tools.ustr(res)
-                        body += res
+                        body += tools.ustr(res, encoding)
 
             msg['body'] = body
             msg['attachments'] = attachments
         res_ids = []
+        attachment_ids = []
         new_res_id = False
         if msg.get('references'):
             references = msg.get('references')
@@ -402,31 +416,34 @@ class mailgate_tool(osv.osv_memory):
                         res_id = res_id.group(1)
                 if res_id:
                     res_id = int(res_id)
-                    res_ids.append(res_id)
                     model_pool = self.pool.get(model)
-
-                    vals = {}
-                    if hasattr(model_pool, 'message_update'):
-                        model_pool.message_update(cr, uid, [res_id], vals, msg, context=context)
+                    if model_pool.exists(cr, uid, res_id):
+                        res_ids.append(res_id)
+                        if hasattr(model_pool, 'message_update'):
+                            model_pool.message_update(cr, uid, [res_id], {}, msg, context=context)
+                        else:
+                            raise NotImplementedError('model %s does not support updating records, mailgate API method message_update() is missing'%model)
 
         if not len(res_ids):
-            new_res_id = create_record(msg)
+            new_res_id, attachment_ids = create_record(msg)
             res_ids = [new_res_id]
+
         # Store messages
         context.update({'model' : model})
-        if hasattr(model_pool, '_history'):
-            model_pool._history(cr, uid, res_ids, _('Receive'), history=True,
+        if hasattr(model_pool, 'history'):
+            model_pool.history(cr, uid, res_ids, _('receive'), history=True,
                             subject = msg.get('subject'),
                             email = msg.get('to'),
                             details = msg.get('body'),
                             email_from = msg.get('from'),
+                            email_cc = msg.get('cc'),
                             message_id = msg.get('message-id'),
                             references = msg.get('references', False),
-                            attach = msg.get('attachments', {}).items(),
+                            attach = attachments.items(),
                             context = context)
         else:
-            self.history(cr, uid, model, res_ids, msg, att_ids, context=context)
-        self.email_forward(cr, uid, model, res_ids, message)
+            self.history(cr, uid, model, res_ids, msg, attachment_ids, context=context)
+        self.email_forward(cr, uid, model, res_ids, msg_txt)
         return new_res_id
 
     def get_partner(self, cr, uid, from_email, context=None):
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index c73d62b08ad..415dc192e50 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" string="Subject" required="1" select="1"/>
+                        <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
                         <field name="user_id" string="Responsible" select="1"/>
                         <field name="partner_id" readonly="1" />
@@ -18,9 +18,9 @@
                             <group col="2" colspan="2">
                                 <separator string="Email Details" colspan="4"/>
                                 <field name="email_from" />
-                                <field name="email_to" />
-                                <field name="email_cc" />
-                                <field name="email_bcc" groups="base.group_extended"/>
+                                <field name="email_to" widget="char" size="512"/>
+                                <field name="email_cc" widget="char" size="512"/>
+                                <field name="email_bcc" widget="char" size="512" groups="base.group_extended"/>
                            </group>
                            <group col="2" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
@@ -86,7 +86,7 @@
                             <field name="date" />
                         </tree>
                         <form string="Mailgate Logs">
-                            <field name="name" />
+                            <field name="name"  widget="char" size="512"/>
                             <field name="date" />
                             <field name="user_id" />
                             <field name="message_id" />
@@ -95,9 +95,9 @@
                                     <group col="4" colspan="4">
                                         <separator string="Email Details" colspan="4"/>
                                         <field name="email_from" />
-                                        <field name="email_to" />
-                                        <field name="email_cc" />
-                                        <field name="email_bcc" />
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="email_bcc" widget="char" size="512"/>
                                    </group>
                                    <separator string="Description" colspan="4"/>
                                     <field name="description" nolabel="1" colspan="4" />
@@ -109,14 +109,14 @@
                             </notebook>
                         </form>
                     </field>
-                    <separator string="Histories" colspan="4"/>
+                    <separator string="History" colspan="4"/>
                     <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                        <tree string="Mailgateway Histories">
+                        <tree string="Mailgateway History">
                             <field name="name" select="1" />
                             <field name="date" />
                         </tree>
-                        <form string="Mailgate Histories">
-                            <field name="name" />
+                        <form string="Mailgate History">
+                            <field name="name" widget="char" size="512"/>
                             <field name="date" />
                             <field name="user_id" />
                             <field name="message_id" />
@@ -126,9 +126,9 @@
                                     <group col="4" colspan="4">
                                         <separator string="Email Details" colspan="4"/>
                                         <field name="email_from" />
-                                        <field name="email_to" />
-                                        <field name="email_cc" />
-                                        <field name="email_bcc" />
+                                        <field name="email_to" widget="char" size="512"/>
+                                        <field name="email_cc" widget="char" size="512"/>
+                                        <field name="email_bcc" widget="char" size="512"/>
                                    </group>
                                 </page>
                                 <page string="Attachments">
@@ -192,7 +192,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
             <field name="domain">[('history', '=', True)]</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
+            <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
         
         <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 166e1e8781f..affd03e03a0 100755
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -51,7 +51,9 @@ class email_parser(object):
 
     def parse(self, message):
         try:
-            res_id = self.rpc('email.server.tools', 'process_email', self.model, message)
+            # pass message as bytes because we don't know its encoding until we parse its headers
+            # and hence can't convert it to utf-8 for transport
+            res_id = self.rpc('email.server.tools', 'process_email', self.model, xmlrpclib.Binary(message))
         except Exception, e:
             logger = logging.getLogger('mail-gateway')
             logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv
index 2a712aab4fd..599d1a27b44 100644
--- a/addons/marketing/security/ir.model.access.csv
+++ b/addons/marketing/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_installer","marketing.installer","model_marketing_installer","base.group_system",1,1,1,1
 "access_res_config_installer","access_marketing_installer","base.model_res_config_installer","base.group_system",1,1,1,1
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 1044030df7e..d9151c3bf33 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,12 +21,11 @@
 
 
 {
-    "name" : "",
+    "name" : "marketing_campaign",
     "version" : "1.1",
     "depends" : ["marketing",
-                "crm",
-                "document",
-                "email_template"
+                 "document",
+                 "email_template"
                 ],
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
@@ -37,6 +36,8 @@ are dynamic and multi-channels. The process:
   miscelleanous actions, etc.
 * Define segments that are selections of target people
 * Launch your campaign to automate communications.
+
+If you need demo data, you can install the module marketing_campaign_crm_demo.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
@@ -50,8 +51,7 @@ are dynamic and multi-channels. The process:
         "security/ir.model.access.csv"
     ],
     'demo_xml': [
-        'marketing_campaign_demo.xml',
-            ],
+    ],
     'installable': True,
     'active': False,
 }
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index a9f898f3270..3b72f183f89 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -23,10 +23,12 @@ import time
 import base64
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+from operator import itemgetter
+from traceback import format_exception
+from sys import exc_info
 
 from osv import fields, osv
 import netsvc
-import tools
 from tools.translate import _
 
 _intervalTypes = {
@@ -36,15 +38,58 @@ _intervalTypes = {
     'years': lambda interval: relativedelta(years=interval),
 }
 
+DT_FMT = '%Y-%m-%d %H:%M:%S'
+
+def dict_map(f, d):
+    return dict((k, f(v)) for k,v in d.items())
+
+def _find_fieldname(model, field):
+    inherit_columns = dict_map(itemgetter(2), model._inherit_fields)
+    all_columns = dict(inherit_columns, **model._columns)
+    for fn in all_columns:
+        if all_columns[fn] is field:
+            return fn
+    raise ValueError('field not found: %r' % (field,))
+
+class selection_converter(object):
+    """Format the selection in the browse record objects"""
+    def __init__(self, value):
+        self._value = value
+        self._str = value
+
+    def set_value(self, cr, uid, _self_again, record, field, lang):
+        # this design is terrible
+        # search fieldname from the field
+        fieldname = _find_fieldname(record._table, field)
+        context = dict(lang=lang.code)
+        fg = record._table.fields_get(cr, uid, [fieldname], context=context)
+        selection = dict(fg[fieldname]['selection'])
+        self._str = selection[self.value]
+
+    @property
+    def value(self):
+        return self._value
+
+    def __str__(self):
+        return self._str
+
+translate_selections = {
+    'selection': selection_converter,
+}
+
+
 class marketing_campaign(osv.osv):
     _name = "marketing.campaign"
     _description = "Marketing Campaign"
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'object_id': fields.many2one('ir.model', 'Object', required=True,
-                                      help="Choose the Object on which you want \
+        'object_id': fields.many2one('ir.model', 'Model', required=True,
+                                      help="Choose the model on which you want \
 this campaign to be run"),
+        'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
+                                            domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
+                                            help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself left this field empty."),
         'mode':fields.selection([('test', 'Test Directly'),
                                 ('test_realtime', 'Test in Realtime'),
                                 ('manual', 'With Manual Confirmation'),
@@ -70,16 +115,17 @@ you required for the campaign"),
     }
 
     def state_running_set(self, cr, uid, ids, *args):
+        # TODO check that all subcampaigns are running
         campaign = self.browse(cr, uid, ids[0])
         if not campaign.activity_ids :
             raise osv.except_osv("Error", "There is no activitity in the campaign")
         actvity_ids = [ act_id.id for act_id in campaign.activity_ids]
         act_obj = self.pool.get('marketing.campaign.activity')
-        act_ids  = act_obj.search(cr, uid, [('id', 'in', actvity_ids), 
+        act_ids  = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
                                                     ('start', '=', True)])
         if not act_ids :
             raise osv.except_osv("Error", "There is no starting activitity in the campaign")
-        act_ids = act_obj.search(cr, uid, [('id', 'in', actvity_ids), 
+        act_ids = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
                                             ('type', '=', 'email')])
         for activity in act_obj.browse(cr, uid, act_ids):
             if not activity.email_template_id.enforce_from_account :
@@ -90,6 +136,7 @@ you required for the campaign"),
         return True
 
     def state_done_set(self, cr, uid, ids, *args):
+        # TODO check that this campaign is not a subcampaign in running mode.
         segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
                                             [('campaign_id', 'in', ids),
                                             ('state', '=', 'running')])
@@ -99,8 +146,36 @@ you required for the campaign"),
         return True
 
     def state_cancel_set(self, cr, uid, ids, *args):
+        # TODO check that this campaign is not a subcampaign in running mode.
         self.write(cr, uid, ids, {'state': 'cancelled'})
         return True
+
+
+    def signal(self, cr, uid, model, res_id, signal, context=None):
+        if not signal:
+            raise ValueError('signal cannot be False')
+
+        Workitems = self.pool.get('marketing.campaign.workitem')
+        domain = [('object_id.model', '=', model),
+                  ('state', '=', 'running')]
+        campaign_ids = self.search(cr, uid, domain, context=context)
+        for campaign in self.browse(cr, uid, campaign_ids, context):
+            for activity in campaign.activity_ids:
+                if activity.signal != signal:
+                    continue
+                wi_domain = [('activity_id', '=', activity.id),
+                             ('res_id', '=', res_id),
+                             ('state', '=', 'todo'),
+                             ('date', '=', False),
+                            ]
+                wi_ids = Workitems.search(cr, uid, wi_domain, context=context)
+                Workitems.process(cr, uid, wi_ids, context=context)
+        return True
+
+    def _signal(self, cr, uid, record, signal, context=None):
+        return self.signal(cr, uid, record._table._name,
+                           record.id, signal, context)
+
 marketing_campaign()
 
 class marketing_campaign_segment(osv.osv):
@@ -135,7 +210,6 @@ class marketing_campaign_segment(osv.osv):
 
     def state_running_set(self, cr, uid, ids, *args):
         segment = self.browse(cr, uid, ids[0])
-        curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
         vals = {'state': 'running'}
         if not segment.date_run:
             vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')
@@ -159,19 +233,21 @@ class marketing_campaign_segment(osv.osv):
     def synchroniz(self, cr, uid, ids, *args):
         self.process_segment(cr, uid, ids)
         return True
-    
-    def process_segment(self, cr, uid, segment_ids=None, context={}):
+
+    def process_segment(self, cr, uid, segment_ids=None, context=None):
+        Workitems = self.pool.get('marketing.campaign.workitem')
         if not segment_ids:
             segment_ids = self.search(cr, uid, [('state', '=', 'running')], context=context)
 
         action_date = time.strftime('%Y-%m-%d %H:%M:%S')
-        campaigns = {}
+        campaigns = set()
         for segment in self.browse(cr, uid, segment_ids, context=context):
-            campaigns[segment.campaign_id.id] = True
+            campaigns.add(segment.campaign_id.id)
             act_ids = self.pool.get('marketing.campaign.activity').search(cr,
-                  uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)])
+                  uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context)
 
             model_obj = self.pool.get(segment.object_id.model)
+            partner_field = segment.campaign_id.partner_field_id.name
             criteria = []
             if segment.sync_last_date:
                 criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
@@ -179,24 +255,34 @@ class marketing_campaign_segment(osv.osv):
                 criteria += eval(segment.ir_filter_id.domain)
             object_ids = model_obj.search(cr, uid, criteria, context=context)
 
-            for o_ids in  model_obj.browse(cr, uid, object_ids, context=context) :
+            for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
                 # avoid duplicated workitem for the same resource
                 if segment.sync_mode == 'write_date':
-                    segids = self.pool.get('marketing.campaign.workitem').search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)])
-                    if segids:
+                    wi_ids = Workitems.search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)], context=context)
+                    if wi_ids:
                         continue
+
+                wi_vals = {
+                    'segment_id': segment.id,
+                    'date': action_date,
+                    'state': 'todo',
+                    'res_id': o_ids.id
+                }
+
+                partner = None
+                if partner_field:
+                    partner = getattr(o_ids, partner_field)
+                elif model_obj._name == 'res.partner':
+                    partner = o_ids
+                if partner:
+                    wi_vals['partner_id'] = partner.id
+
                 for act_id in act_ids:
-                    wi_vals = {
-                        'segment_id': segment.id,
-                        'activity_id': act_id,
-                        'date': action_date,
-                        'partner_id': o_ids.partner_id and o_ids.partner_id.id or False,
-                        'state': 'todo',
-                        'res_id': o_ids.id
-                    }
-                    self.pool.get('marketing.campaign.workitem').create(cr, uid, wi_vals)
-            self.write(cr, uid, segment.id, {'sync_last_date':action_date})
-        self.pool.get('marketing.campaign.workitem').process_all(cr, uid, campaigns.keys(), context=context)
+                    wi_vals['activity_id'] = act_id
+                    Workitems.create(cr, uid, wi_vals, context=context)
+
+            self.write(cr, uid, segment.id, {'sync_last_date':action_date}, context=context)
+        Workitems.process_all(cr, uid, list(campaigns), context=context)
         return True
 
 marketing_campaign_segment()
@@ -204,20 +290,30 @@ marketing_campaign_segment()
 class marketing_campaign_activity(osv.osv):
     _name = "marketing.campaign.activity"
     _description = "Campaign Activity"
-    _actions_type = [('email', 'E-mail'), ('paper', 'Paper'), ('action', 'Action'),
-                        ('subcampaign', 'Sub-Campaign')]
+
+    _action_types = [
+        ('email', 'E-mail'),
+        ('paper', 'Paper'),
+        ('action', 'Action'),
+        # TODO implement the subcampaigns. The segment_id on woritems must be
+        # optional (thus campaign_id must be a real many2one, and a constraint
+        # must be set). 
+        # TODO implement the subcampaign out. disallow out transitions from
+        # subcampaign activities ?
+        #('subcampaign', 'Sub-Campaign'),
+    ]
+
     _columns = {
         'name': fields.char('Name', size=128, required=True),
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
                                             required = True, ondelete='cascade', select=1),
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
-                                      string='Object'),
+                                      string='Object', readonly=True),
         'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
         'condition': fields.char('Condition', size=256, required=True,
                                  help="Python condition to know if the activity can be launched"),
-        'type': fields.selection(_actions_type,
-                                  'Type', required=True,
+        'type': fields.selection(_action_types, 'Type', required=True,
                                   help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
         'email_template_id': fields.many2one('email.template','Email Template'),
         'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
@@ -232,24 +328,33 @@ class marketing_campaign_activity(osv.osv):
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_to_id',
                                             'Previous Activities'),
-        'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign'),
-        'subcampaign_segment_id': fields.many2one('marketing.campaign.segment',
-                                                   'Sub Campaign Segment'),
+        #'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign',
+        #                                  domain="[('object_id', '=', object_id)]"),
         'variable_cost': fields.float('Variable Cost'),
-        'revenue': fields.float('Revenue')
+        'revenue': fields.float('Revenue'),
+        'signal': fields.char('Signal', size=128,
+                              help='An activity with a signal can be called \
+                                      programmatically'),
     }
 
     _defaults = {
         'type': lambda *a: 'email',
         'condition': lambda *a: 'True',
-        'object_id' : lambda obj, cr, uid, context  : context.get('object_id',False),
     }
-    def __init__(self, *args):
-        self._actions = {'paper' : self.process_wi_report,
-                    'email' : self.process_wi_email,
-                    'action' : self.process_wi_action,
-        }
-        return super(marketing_campaign_activity, self).__init__(*args)
+
+    def _check_signal(self, cr, uid, ids, context=None):
+        return all(activity.signal
+                   for activity in self.browse(cr, uid, ids, context)
+                   for transition in activity.from_ids
+                   if transition.trigger == 'signal')
+
+    _constraints = [
+        (_check_signal,
+         "An incoming transition is triggered by a signal but this transition \
+                doesn't have one",
+         ['signal', 'from_ids']
+        ),
+    ]
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
                                         context=None, count=False):
@@ -265,7 +370,7 @@ class marketing_campaign_activity(osv.osv):
         return super(marketing_campaign_activity, self).search(cr, uid, args,
                                            offset, limit, order, context, count)
 
-    def process_wi_report(self, cr, uid, activity, workitem, context={}):
+    def _process_wi_paper(self, cr, uid, activity, workitem, context=None):
         service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
         (report_data, format) = service.create(cr, uid, [], {}, {})
         attach_vals = {
@@ -280,49 +385,111 @@ class marketing_campaign_activity(osv.osv):
         self.pool.get('ir.attachment').create(cr, uid, attach_vals)
         return True
 
-    def process_wi_email(self, cr, uid, activity, workitem, context=None):
-        return self.pool.get('email.template').generate_mail(cr, uid, 
-                                            activity.email_template_id.id, 
+    def _process_wi_email(self, cr, uid, activity, workitem, context=None):
+        return self.pool.get('email.template').generate_mail(cr, uid,
+                                            activity.email_template_id.id,
                                             [workitem.res_id], context=context)
 
-    def process_wi_action(self, cr, uid, activity, workitem, context={}):
-        context = {}
+    def _process_wi_action(self, cr, uid, activity, workitem, context=None):
+        if context is None:
+            context = {}
         server_obj = self.pool.get('ir.actions.server')
-        context['active_id'] = workitem.res_id
-        res = server_obj.run(cr, uid, [activity.server_action_id.id], context)
-        #server action return False if the action is perfomed except client_action,other and python code
-        return res==False and True or res 
 
-    def process(self, cr, uid, act_id, wi_id, context={}):
-        activity = self.browse(cr, uid, act_id)
+        action_context = dict(context,
+                              active_id=workitem.res_id,
+                              active_ids=[workitem.res_id],
+                              active_model=workitem.object_id.model)
+        res = server_obj.run(cr, uid, [activity.server_action_id.id],
+                             context=action_context)
+        # server action return False if the action is perfomed
+        # except client_action, other and python code
+        return res == False and True or res
+
+    def process(self, cr, uid, act_id, wi_id, context=None):
+        activity = self.browse(cr, uid, act_id, context=context)
+        method = '_process_wi_%s' % (activity.type,)
+        action = getattr(self, method, None)
+        if not action:
+            raise NotImplementedError('method %r in not implemented on %r object' % (method, self))
+
         workitem_obj = self.pool.get('marketing.campaign.workitem')
         workitem = workitem_obj.browse(cr, uid, wi_id, context=context)
-        return self._actions[activity.type](cr, uid, activity, workitem, context)
+        return action(cr, uid, activity, workitem, context)
 
 marketing_campaign_activity()
 
 class marketing_campaign_transition(osv.osv):
     _name = "marketing.campaign.transition"
     _description = "Campaign Transition"
-    _rec_name = "interval_type"
+
+    _interval_units = [('hours', 'Hour(s)'), ('days', 'Day(s)'),
+                       ('months', 'Month(s)'), ('years','Year(s)')]
+
+
+    def _get_name(self, cr, uid, ids, fn, args, context=None):
+        result = dict.fromkeys(ids, False)
+        formatters = {
+            'auto': _('Automatic transition'),
+            'time': _('After %(interval_nbr)d %(interval_type)s'),
+            'signal': _('On signal'),
+        }
+        for tr in self.browse(cr, uid, ids, context=context,
+                              fields_process=translate_selections):
+            result[tr.id] = formatters[tr.trigger.value] % tr
+        return result
+
+
+    def _delta(self, cr, uid, ids, context=None):
+        assert len(ids) == 1
+        transition = self.browse(cr, uid, ids[0], context)
+        if transition.trigger != 'time':
+            raise ValueError('Delta is only relevant for timed transiton')
+        return relativedelta(**{transition.interval_type: transition.interval_nbr})
+
 
     _columns = {
+        'name': fields.function(_get_name, method=True, string='Name',
+                                type='char', size=128),
         'activity_from_id': fields.many2one('marketing.campaign.activity',
-                                                             'Source Activity', select=1),
+                                            'Source Activity', select=1,
+                                            required=True),
         'activity_to_id': fields.many2one('marketing.campaign.activity',
-                                                        'Destination Activity'),
-        'interval_nbr': fields.integer('Interval No.'),
-        'interval_type': fields.selection([('hours', 'Hours'), ('days', 'Days'),
-                                           ('months', 'Months'),
-                                            ('years','Years')],'Interval Type')
+                                          'Destination Activity',
+                                          required=True),
+        'interval_nbr': fields.integer('Interval Value', required=True),
+        'interval_type': fields.selection(_interval_units, 'Interval Unit',
+                                          required=True),
+
+        'trigger': fields.selection([('auto', 'Automatic'),
+                                     ('time', 'Time'),
+                                     ('signal','Signal')],
+                                    'Trigger', required=True,
+                                    help="How is trigger the destination workitem"),
     }
 
-    def default_get(self, cr, uid, fields, context={}):
-        value = super(marketing_campaign_transition, self).default_get(cr, uid,
-                                                                fields, context)
-        if context.has_key('type_id'):
-            value[context['type_id']] = context['activity_id']
-        return value
+    _defaults = {
+        'interval_nbr': 1,
+        'interval_type': 'days',
+        'trigger': 'time',
+    }
+
+    _sql_constraints = [
+        ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
+    ]
+
+    def _check_signal(self, cr, uid, ids, context=None):
+        return all(tr.activity_to_id.signal
+                   for tr in self.browse(cr, uid, ids, context)
+                   if tr.trigger == 'signal')
+
+    _constraints = [
+        (_check_signal,
+         "The transition is triggered by a signal but destination activity \
+                doesn't have one",
+         ['trigger', 'activity_to_ids']
+        ),
+    ]
+
 
 marketing_campaign_transition()
 
@@ -331,15 +498,15 @@ class marketing_campaign_workitem(osv.osv):
     _description = "Campaign Workitem"
 
     def _res_name_get(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.res_id:
-                try:
-                    res[obj.id] = self.pool.get(obj.object_id.model).name_get(cr, uid, [obj.res_id], context=context)[0][1]
-                except:
-                    res[obj.id] = '/'
-            else:
-                res[obj.id] = '/'
+        res = dict.fromkeys(ids, '/')
+        for wi in self.browse(cr, uid, ids, context=context):
+            if not wi.res_id:
+                continue
+
+            proxy = self.pool.get(wi.object_id.model)
+            ng = proxy.name_get(cr, uid, [wi.res_id], context=context)
+            if ng:
+                res[wi.id] = ng[0][1]
         return res
 
     _columns = {
@@ -353,9 +520,9 @@ class marketing_campaign_workitem(osv.osv):
              type='many2one', relation='ir.model', string='Object', select=1),
         'res_id': fields.integer('Resource ID', select=1, readonly=1),
         'res_name': fields.function(_res_name_get, method=True, string='Resource Name', type="char", size=64),
-        'date': fields.datetime('Execution Date'),
+        'date': fields.datetime('Execution Date', help='If date is not set, this workitem have to be run manually'),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
-        'state': fields.selection([('todo', 'To Do'), ('inprogress', 'In Progress'),
+        'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),
                                    ('cancelled', 'Cancelled')], 'State'),
 
@@ -363,27 +530,9 @@ class marketing_campaign_workitem(osv.osv):
     }
     _defaults = {
         'state': lambda *a: 'todo',
+        'date': False,
     }
 
-    def process_chain(self, cr, uid, workitem_id, context={}):
-        workitem = self.browse(cr, uid, workitem_id)
-        for mct_id in workitem.activity_id.to_ids:
-            launch_date = time.strftime('%Y-%m-%d %H:%M:%S')
-            if mct_id.interval_type and mct_id.interval_nbr :
-                launch_date = (datetime.now() + _intervalTypes[ \
-                                mct_id.interval_type](mct_id.interval_nbr) \
-                                ).strftime('%Y-%m-%d %H:%M:%S')
-            workitem_vals = {
-                'segment_id': workitem.segment_id.id,
-                'activity_id': mct_id.activity_to_id.id,
-                'date': launch_date,
-                'partner_id': workitem.partner_id.id,
-                'res_id': workitem.res_id,
-                'state': 'todo',
-            }
-            self.create(cr, uid, workitem_vals)
-        return True
-
     def button_draft(self, cr, uid, workitem_ids, context={}):
         for wi in self.browse(cr, uid, workitem_ids, context=context):
             if wi.state=='exception':
@@ -396,63 +545,114 @@ class marketing_campaign_workitem(osv.osv):
                 self.write(cr, uid, [wi.id], {'state':'cancelled'}, context=context)
         return True
 
-    def process(self, cr, uid, workitem_ids, context={}):
-        for wi in self.browse(cr, uid, workitem_ids):
-            if wi.state == 'todo':
-                eval_context = {
-                    'pool': self.pool,
-                    'cr': cr,
-                    'uid': uid,
-                    'wi': wi,
-                    'object': wi.activity_id,
-                    'transition': wi.activity_id.to_ids
-                }
-                try:
-                    expr = eval(str(wi.activity_id.condition), eval_context)
-                    if expr:
-                        result = True
-                        if wi.campaign_id.mode in ('manual','active'):
-                            result = self.pool.get('marketing.campaign.activity').process(
-                                cr, uid, wi.activity_id.id, wi.id, context)
-                        if result:
-                            self.write(cr, uid, wi.id, {'state': 'done'})
-                            self.process_chain(cr, uid, wi.id, context)
-                        else:
-                            vals = {'state': 'exception'}
-                            if type(result) == type({}) and 'error_msg' in result:
-                                vals['error_msg'] = result['error_msg']
-                            self.write(cr, uid, wi.id, vals)
-                    else:
-                        self.write(cr, uid, wi.id, {'state': 'cancelled'})
-                except Exception,e:
-                    self.write(cr, uid, wi.id, {'state': 'exception', 'error_msg': str(e)})
+    def _process_one(self, cr, uid, workitem, context=None):
+        if workitem.state != 'todo':
+            return
+
+        activity = workitem.activity_id
+
+        eval_context = {
+            'pool': self.pool,
+            'cr': cr,
+            'uid': uid,
+            'wi': workitem,
+            'object': activity,
+            'transition': activity.to_ids
+        }
+        try:
+            condition = activity.condition
+            campaign_mode = workitem.campaign_id.mode
+            if condition:
+                if not eval(condition, eval_context):
+                    workitem.write({'state': 'cancelled'}, context=context)
+                    return
+            result = True
+            if campaign_mode in ('manual', 'active'):
+                Activities = self.pool.get('marketing.campaign.activity')
+                result = Activities.process(cr, uid, activity.id, workitem.id,
+                                            context=context)
+
+            values = dict(state='done')
+            if not workitem.date:
+                values['date'] = datetime.now().strftime(DT_FMT)
+            workitem.write(values, context=context)
+
+            if result:
+                # process _chain
+                for transition in activity.to_ids:
+                    launch_date = False
+                    if transition.trigger == 'auto':
+                        launch_date = datetime.now()
+                    elif transition.trigger == 'time':
+                        launch_date = datetime.now() + transition._delta()
+
+                    if launch_date:
+                        launch_date = launch_date.strftime(DT_FMT)
+                    values = {
+                        'date': launch_date,
+                        'segment_id': workitem.segment_id.id,
+                        'activity_id': transition.activity_to_id.id,
+                        'partner_id': workitem.partner_id.id,
+                        'res_id': workitem.res_id,
+                        'state': 'todo',
+                    }
+                    wi_id = self.create(cr, uid, values, context=context)
+
+                    # Now, depending of the trigger and the campaign mode 
+                    # we now if must run the newly created workitem.
+                    #
+                    # rows = transition trigger \ colums = campaign mode
+                    #
+                    #           test    test_realtime     manual      normal (active)
+                    # time       Y            N             N           N
+                    # signal     N            N             N           N
+                    # auto       Y            Y             Y           Y
+                    # 
+
+                    run = transition.trigger == 'auto' \
+                          or (transition.trigger == 'time' \
+                              and campaign_mode == 'test')
+                    if run:
+                        new_wi = self.browse(cr, uid, wi_id, context)
+                        self._process_one(cr, uid, new_wi, context)
+
+        except Exception:
+            tb = "".join(format_exception(*exc_info()))
+            workitem.write({'state': 'exception', 'error_msg': tb},
+                     context=context)
+
+    def process(self, cr, uid, workitem_ids, context=None):
+        for wi in self.browse(cr, uid, workitem_ids, context):
+            self._process_one(cr, uid, wi, context)
         return True
 
-    def process_all(self, cr, uid, camp_ids=None, context={}):
+    def process_all(self, cr, uid, camp_ids=None, context=None):
         camp_obj = self.pool.get('marketing.campaign')
-        if not camp_ids:
+        if camp_ids is None:
             camp_ids = camp_obj.search(cr, uid, [('state','=','running')], context=context)
         for camp in camp_obj.browse(cr, uid, camp_ids, context=context):
+            if camp.mode == 'manual':
+                # manual states are not processed automatically
+                continue
             while True:
-                if camp.mode in ('test_realtime','active'):
-                    workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
-                            ('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
-                elif camp.mode == 'test':
-                    workitem_ids = self.search(cr, uid, [('state', '=', 'todo')])
-                else:
-                    # manual states are not processed automatically
-                    workitem_ids = []
-                if workitem_ids:
-                    self.process(cr, uid, workitem_ids, context)
-                else:
+                domain = [('state', '=', 'todo'), ('date', '!=', False)]
+                if camp.mode in ('test_realtime', 'active'):
+                    domain += [('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))]
+
+                workitem_ids = self.search(cr, uid, domain, context=context)
+                if not workitem_ids:
                     break
 
+                self.process(cr, uid, workitem_ids, context)
+        return True
+
     def preview(self, cr, uid, ids, context):
         res = {}
-        wi_obj = self.browse(cr, uid, ids)[0]
+        wi_obj = self.browse(cr, uid, ids[0], context)
         if wi_obj.activity_id.type == 'email':
             data_obj = self.pool.get('ir.model.data')
             data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
+            view_id = 0
             if data_id:
                 view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
             res = {
@@ -466,21 +666,20 @@ class marketing_campaign_workitem(osv.osv):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
-                'context': "{'template_id':%d,'rel_model_ref':%d}"%
+                'context': "{'template_id':%d,'default_rel_model_ref':%d}"%
                                 (wi_obj.activity_id.email_template_id.id,
                                  wi_obj.res_id)
-                                 
             }
 
         elif wi_obj.activity_id.type == 'paper':
             datas = {'ids': [wi_obj.res_id],
                      'model': wi_obj.object_id.model}
-            res = { 
+            res = {
                 'type' : 'ir.actions.report.xml',
                 'report_name': wi_obj.activity_id.report_id.report_name,
                 'datas' : datas,
-                'nodestroy': True, 
-                }
+                'nodestroy': True,
+            }
         return res
 
 marketing_campaign_workitem()
@@ -491,30 +690,15 @@ class email_template(osv.osv):
         'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
     }
 email_template()
-    
-class email_template_preview(osv.osv_memory):
-    _inherit = "email_template.preview"
-    
-    def _default_rel_model(self, cr, uid, context=None):
-        if 'rel_model_ref' in context :
-            return context['rel_model_ref']
-        else :
-            return False
-            
-    _defaults = {
-        'rel_model_ref' : _default_rel_model
-    }
-
-email_template_preview()
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-        if not context:
+        if context is None:
             context = {}
-        if context and 'object_id' in context and context['object_id']:
-            model = self.pool.get('ir.model').browse(cr, uid,
-                                                    context['object_id']).model
+        object_id = context.get('object_id')
+        if object_id:
+            model = self.pool.get('ir.model').browse(cr, uid, object_id).model
             args.append(('model', '=', model))
         return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
 
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index d7d5cfe22d4..4ac70292c32 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -21,65 +21,9 @@
                     <field name="object_id" select="1"/>
                     <field name="mode"/>
                     <field name="fixed_cost"/>
+                    <field name="partner_field_id"/>
                 </group>
-                <field name="activity_ids" nolabel = "1" colspan="4" default_get="{'object_id':object_id}">
-                    <form string="Activities">
-                        <group colspan="4" col="6">
-                            <separator string="Activity Definition" colspan="4"/>
-                            <separator string="Cost Control" colspan="2"/>
-                            <field name="name" select="1" />
-                            <field name="start"/>
-                            <field name="variable_cost" select="1"/>
-                            <field name="object_id" invisible="1"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Condition" colspan="2"/>
-                            <field name="condition"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Action" colspan="2"/>
-                            <field name="type" colspan="4"/>
-                            <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >
-                                <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
-                                <field name="report_id" attrs="{'required':[('type','=','paper')]}"/>
-                                <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
-                                <field name="server_action_id" attrs="{'required':[('type','=','action')]}" domain="[('model_id','=',object_id)]" />
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >
-                                <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                                <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                            </group>
-                        </group>
-                        <newline/>
-                        <group colspan="4" col="4">
-                            <separator string="Transitions" colspan="4"/>
-                            <field name="to_ids" nolabel="1" colspan="2" mode="tree" default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
-                                 <tree string="Outgoing Transitions" editable="bottom">
-                                     <field name="activity_to_id"/>
-                                     <field name="interval_nbr"/>
-                                     <field name="interval_type"/>
-                                 </tree>
-                             </field>
-                             <field name="from_ids" nolabel="1" colspan="2" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
-                                 <tree string="Incoming Transitions" editable="bottom">
-                                     <field name="activity_from_id"/>
-                                     <field name="interval_nbr"/>
-                                     <field name="interval_type"/>
-                                 </tree>
-                             </field>
-                         </group>
-                    </form>
-                    <tree string="Activities">
-                        <field name="name"/>
-                        <field name="start"/>
-                        <field name="condition"/>
-                        <field name="type"/>
-                    </tree>
-                </field>
+                <field name="activity_ids" nolabel = "1" colspan="4" default_get="{'default_object_id': object_id}" />
                 <separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
@@ -117,7 +61,7 @@
                     <field name="start" invisible="1"/>
                     <field name="condition"/>
                 </node>
-                <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']">
+                <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['name']">
                     <field name="activity_from_id"/>
                     <field name="activity_to_id"/>
                     <field name="interval_nbr"/>
@@ -264,6 +208,8 @@
     ======================
     Marketing Activities
     ======================
+
+    these views are not intended to be used outside the campaign context.
     -->
 
     <record model="ir.ui.view" id="view_marketing_campaign_activity_form">
@@ -272,59 +218,61 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Activities">
-
-                <group colspan="4" col="6">
-                    <separator string="Activity Definition" colspan="4"/>
-                    <separator string="Cost Control" colspan="2"/>
-                    <field name="name" select="1" />
-                    <field name="start"/>
-                    <field name="variable_cost" select="1"/>
-                    <field name="object_id" invisible="1"/>
-                </group>
-                <group colspan="2" col="2">
-                    <separator string="Condition" colspan="2"/>
-                    <field name="condition"/>
-                </group>
-                <group colspan="2" col="2">
-                    <separator string="Action"/>
-                    <field name="type" colspan="4"/>
-                    <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >
-                        <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
-                    </group>
-                    <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
-                        <field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
-                        <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
-                    </group>
-                    <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
-                        <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
-                    </group>
-                    <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >
-                        <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                        <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
+                <field name="object_id" invisible="1"/>
+                <separator string="Activity Definition" colspan="4"/>
+                <field name="name" select="1" colspan='4' />
+                <field name="signal"/>
+                <field name="start"/>
+                <field name="variable_cost" select="1"/>
+                <newline/> 
+                
+                <separator string="Action" colspan="4"/>
+                <group colspan='4' col='4'>
+                    <field name="condition" colspan='4'/>
+                    <field name="type" width='100'/>
+                    <group colspan='2' col='1'>
+                        <group attrs="{'invisible':[('type','!=','email')]}" >
+                            <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
+                        </group>
+                        <group attrs="{'invisible':[('type','!=','paper')]}" >
+                            <field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
+                            <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
+                        </group>
+                        <group attrs="{'invisible':[('type','!=','action')]}" >
+                            <field name="server_action_id" attrs="{'required':[('type','=','action')]}" domain="[('model_id','=',object_id)]" />
+                        </group>
+                        <!--
+                        <group attrs="{'invisible':[('type','!=','subcampaign')]}" >
+                            <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
+                        </group>
+                        -->
                     </group>
                 </group>
                 <newline/>
-                <group colspan="4" col="4">
-                    <separator string="Transitions" colspan="4"/>
-                    <field name="to_ids" nolabel="1" colspan="2" mode="tree" default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
-                         <tree string="Outgoing Transitions" editable="bottom">
-                             <field name="activity_to_id"/>
-                             <field name="interval_nbr"/>
-                             <field name="interval_type"/>
-                         </tree>
-                     </field>
-                     <field name="from_ids" nolabel="1" colspan="2" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
-                         <tree string="Incoming Transitions" editable="bottom">
-                             <field name="activity_from_id"/>
-                             <field name="interval_nbr"/>
-                             <field name="interval_type"/>
-                         </tree>
+
+                <group colspan="4" col="2" expand="1">
+                    <separator string="Transitions" colspan="2"/>
+                    <field name="from_ids" nolabel="1" mode="tree" default_get="{'default_activity_to_id': active_id}">
+                        <tree string="Incoming Transitions" editable="bottom">
+                            <field name="activity_from_id"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </tree>
+                    </field>
+                    <field name="to_ids" nolabel="1" mode="tree" default_get="{'default_activity_from_id': active_id}">
+                        <tree string="Outgoing Transitions" editable="bottom">
+                            <field name="activity_to_id"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </tree>
                      </field>
                 </group>
             </form>
         </field>
     </record>
-
+    
     <record model="ir.ui.view" id="view_marketing_campaign_activity_tree">
         <field name="name">marketing.campaign.activity.tree</field>
         <field name="model">marketing.campaign.activity</field>
@@ -332,7 +280,6 @@
         <field name="arch" type="xml">
             <tree string="Activities">
                 <field name="name" select="1"/>
-                <field name="campaign_id" select="1"/>
                 <field name="start"/>
                 <field name="condition"/>
                 <field name="type"/>
@@ -340,16 +287,6 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="action_marketing_campaign_activity_form">
-        <field name="name">Activities</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">marketing.campaign.activity</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_marketing_campaign_activity_tree"/>
-    </record>
-
-       <!--menuitem id="menu_marketing_campaign_activity_form" parent="menu_marketing" action="action_marketing_campaign_activity_form" sequence="3" /-->
 
     <!--
     ======================
@@ -423,7 +360,6 @@
        <field name="arch" type="xml">
            <search string="Marketing Campaign Activities">
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name = "todo" domain="[('state','=','todo')]"/>
-               <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','inprogress')]"/>
                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                <separator orientation="vertical"/>
                <field name="segment_id" select="1"/>
@@ -443,7 +379,7 @@
    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Activities</field>
+        <field name="name">Campaign Activities (Workitems)</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index 2ec92522d6a..98ac53b7b29 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -22,16 +22,15 @@
 from osv import fields,osv
 
 class res_partner(osv.osv):
-    """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
 
     _columns = {
-                'workitem_ids': fields.one2many('marketing.campaign.workitem', 'partner_id',\
-                                        'Workitems', readonly=True),
-
-                }
+        'workitem_ids': fields.one2many('marketing.campaign.workitem',
+                                        'partner_id', 'Workitems',
+                                        readonly=True),
+    }
 
 res_partner()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/marketing_campaign_crm_demo/__init__.py b/addons/marketing_campaign_crm_demo/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
new file mode 100644
index 00000000000..c812efef171
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -0,0 +1,41 @@
+# -*- 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" : "marketing_campaign_crm_demo",
+    "version" : "1.0",
+    "depends" : ["marketing_campaign",
+                 "crm",
+                ],
+    "author" : "OpenERP SA",
+    "category": 'Generic Modules/Marketing',
+    "description": """Demo data for the module marketing_campaign.""",
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [
+        'marketing_campaign_demo.xml',
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml b/addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml
similarity index 100%
rename from addons/marketing_campaign/report/crm_lead_mc_demo_report.rml
rename to addons/marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
similarity index 98%
rename from addons/marketing_campaign/marketing_campaign_demo.xml
rename to addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 8bc5f879321..f67a747e518 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -19,7 +19,7 @@
             <field eval="&quot;&quot;&quot;[]&quot;&quot;&quot;" name="domain"/>
             <field name="parent_id" ref="document_directory_marketingcampaign"/>
             <field eval="&quot;&quot;&quot;ressource&quot;&quot;&quot;" name="type"/>
-            <field name="ressource_type_id" ref="model_marketing_campaign"/>
+            <field name="ressource_type_id" ref="marketing_campaign.model_marketing_campaign"/>
         </record>
 
         <!-- Email tempalte -->
@@ -163,7 +163,7 @@
             <field name="type">ir.actions.report.xml</field>
             <field name="model">crm.lead</field>
             <field name="report_name">crm.lead.demo</field>
-            <field name="report_rml">marketing_campaign/report/crm_lead_mc_demo_report.rml</field>
+            <field name="report_rml">marketing_campaign_crm_demo/crm_lead_mc_demo_report.rml</field>
             <field name="report_type">pdf</field>
         </record>
 
@@ -171,6 +171,7 @@
         <record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
             <field name="name">OpenERP OnDemand Free Trial 2010</field>
             <field name="object_id" ref="crm.model_crm_lead"/>
+            <field name="partner_field_id" ref="crm.field_crm_lead_partner_id"/>
         </record>
 
             <!-- Activity -->
@@ -303,4 +304,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
index f3d8386623e..566bf497fd7 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
@@ -22,11 +22,9 @@ import urllib
 import urllib2
 import simplejson as json
 import time
-from datetime import datetime
-
 
 from osv import fields, osv
-from marketing_campaign.marketing_campaign import _intervalTypes
+
 mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
 
 class mailchimp_account(osv.osv):
@@ -150,7 +148,7 @@ class marketing_campaign_activity(osv.osv):
             return {}
         return {'value':{}}
 
-    def process_wi_mailchimp(self, cr, uid, activity, workitem, context={}):
+    def _process_wi_mailchimp(self, cr, uid, activity, workitem, context=None):
         mailchimp_account_id = activity.mailchimp_account_id.id
         list_name = activity.mailchimp_list
         mc_acc_obj = self.pool.get('mailchimp.account')
@@ -193,18 +191,15 @@ class marketing_campaign_activity(osv.osv):
                     'merge_vars[address][city]' : model_obj.city and model_obj.city or '',
                     'merge_vars[phone]' : model_obj.phone and model_obj.phone or '',
                     })
-                res = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
-                # handle mailchimp error
+                mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
+                # TODO handle mailchimp error
             return True
-        else : 
+        else :
             return {'error_msg' : "Invalid Email Address"}
-    
+
     def __init__(self, *args):
-        res = super(marketing_campaign_activity, self).__init__(*args)
-        self._actions.update({'mailchimp' : self.process_wi_mailchimp})
-        self._actions_type.append(('mailchimp', 'Mailchimp'))
-        return res 
-    
+        super(marketing_campaign_activity, self).__init__(*args)
+        self._action_types.append(('mailchimp', 'Mailchimp'))
 
 marketing_campaign_activity()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index ea9fba18384..b4a89a2ca43 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -14,29 +14,12 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_activity_form"/>
         <field name="arch" type="xml">
-            <field name="type" position="after">
-                <group colspan="2" ><!--attrs="{'invisible':[('type','!=','mailchimp')]}"-->
-                    <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
-                    <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
-                </group>                
-            </field>
-        </field>
-    </record>
-
-
-
-    <record model="ir.ui.view" id="view_marketing_campaign_form_inherit">
-        <field name="name">marketing.campaign.form.inherit</field>
-        <field name="model">marketing.campaign</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_form"/>
-        <field name="arch" type="xml">
-            <field name="type" position="after">
+            <xpath expr='//field[@name="type"]/following-sibling::group' position='inside'>
                 <group colspan="2" attrs="{'invisible':[('type','!=','mailchimp')]}">
                     <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
                     <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
                 </group>                
-            </field>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index 9f2d1681b0f..f3d91646c44 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -2,5 +2,3 @@
 "access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
 "access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0
-"access_membership_invoice","membership.invoice","model_membership_invoice",,1,1,1,1
-"access_membership_unpaid_invoice","membership.unpaid.invoice","model_membership_unpaid_invoice",,1,0,0,0
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index 5a67ea7f476..6b0dab2a9e5 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -23,7 +23,6 @@
         country_id: base.fr
         name: Arthur Grosbonnet
         street: 1 rue Rockfeller
-        title: M.
         type: default
         zip: '75016'
     credit_limit: 0.0
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 676e38d2e78..3065516b125 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -86,9 +86,10 @@
     ],
     'demo_xml': ['mrp_demo.xml', 'board_manufacturing_demo.xml'],
     'test': [
-             'test/mrp_phantom_bom.yml',
-             'test/mrp_production_order.yml',
-             'test/mrp_procurement.yml'
+         'test/mrp_packs.yml',
+         'test/mrp_phantom_bom.yml',
+         'test/mrp_production_order.yml',
+         'test/mrp_procurement.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 25d124206fe..4f62030999c 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -35,17 +35,13 @@
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem
-            id="next_id_87"
-            name="Production"
-            parent="base.dashboard"
-            groups="mrp.group_mrp_manager"/>
+        <menuitem icon="terp-graph" id="menus_dash_mrp" name="Dashboard"
+            parent="next_id_77" sequence="0"/>
         <menuitem
             action="open_board_manufacturing"
             icon="terp-graph"
             id="menu_board_manufacturing"
-            parent="next_id_87"
-            sequence="1"/>
+            parent="menus_dash_mrp"
+            sequence="1" groups="mrp.group_mrp_manager"/>
     </data>
 </openerp>
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 65ea2491f0a..1647cc15a03 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 8ee210a77ce..efc690704ed 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -92,14 +92,12 @@ msgid "Stockable Stock"
 msgstr "Складируеми стоки"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Произход"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Настройки"
 
@@ -174,8 +172,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -261,8 +258,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -302,22 +298,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -363,8 +356,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -471,8 +463,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -592,10 +583,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -668,8 +657,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -695,8 +683,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -754,9 +741,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -768,8 +753,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -784,14 +768,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -873,14 +855,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -990,8 +968,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1052,8 +1029,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1082,8 +1058,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1118,8 +1093,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1169,8 +1143,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1196,10 +1169,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1212,23 +1183,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Свойства"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1276,8 +1242,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1325,18 +1290,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1351,8 +1313,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1376,14 +1337,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1395,14 +1354,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1440,8 +1397,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1467,8 +1423,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1699,8 +1654,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1740,8 +1694,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1751,14 +1704,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1812,11 +1763,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1869,14 +1817,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1934,8 +1878,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1946,3 +1889,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Седмица"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Справки"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Натоварване на работните центрове"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Натоварване на работния центрър"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "MRP - Справки"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 5baba2694a6..c732d48a720 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Osobine"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index ece96009fd5..5404ede0c31 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "Estoc productes estocables"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Origen"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configuració"
 
@@ -178,8 +176,7 @@ msgstr "Proveïments automàtics"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Qtat producte"
@@ -265,8 +262,7 @@ msgid "Internal Ref."
 msgstr "Ref. interna"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Estat"
@@ -308,22 +304,19 @@ msgstr "Estocable obtingut per estoc"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Ordres de producció"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Quantitat"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "No urgent"
 
@@ -369,8 +362,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgent"
 
@@ -487,8 +479,7 @@ msgid "Stockable Product Stock"
 msgstr "Estoc de producte estocable"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "UdV del producte"
 
@@ -613,10 +604,8 @@ msgid "Waiting"
 msgstr "En espera"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Procés productiu"
@@ -689,8 +678,7 @@ msgid "Production orders"
 msgstr "Ordres de producció"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Jerarquia LdM"
 
@@ -718,8 +706,7 @@ msgid "Security Days"
 msgstr "Dies de seguretat"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Total cicles"
 
@@ -779,9 +766,7 @@ msgid "Production done"
 msgstr "Producció realitzada"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Codi"
@@ -793,8 +778,7 @@ msgstr "Núm. d'hores"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Grup de propietat"
 
@@ -809,14 +793,12 @@ msgid "References"
 msgstr "Referències"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -900,14 +882,10 @@ msgid "Nbr of cycle"
 msgstr "Núm. de cicle"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nom"
 
@@ -1020,8 +998,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Llista de material"
@@ -1082,8 +1059,7 @@ msgid "Sale Ref"
 msgstr "Ref. venda"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioritat (0=Molt urgent)"
@@ -1112,8 +1088,7 @@ msgstr "Reparació"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Ubicació on el sistema cercarà productes utilitzats en les matèries primeres."
 
@@ -1151,8 +1126,7 @@ msgid "Max Quantity"
 msgstr "Quantitat màx"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Proveïment"
 
@@ -1202,8 +1176,7 @@ msgid "Procurement for raw materials."
 msgstr "Proveïment per matèria primeres."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Nota"
@@ -1229,10 +1202,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Defineix un procés productiu per descriure els passos de fabricació"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Actiu"
 
@@ -1245,23 +1216,18 @@ msgstr "Proveir products"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propietats"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Data planificada"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Informació extra"
 
@@ -1311,8 +1277,7 @@ msgid "Change Product Qty."
 msgstr "Canvia Qtat. producte"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Realitzat"
 
@@ -1360,18 +1325,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacitat per cicle"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Producte"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Total hores"
 
@@ -1386,8 +1348,7 @@ msgid "Product BoM Structure"
 msgstr "Estructura LdM del producte"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1414,15 +1375,12 @@ msgstr ""
 "Tipus de producte és estocable i mètode de proveïment és obtenir per estoc"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
-"Validesa d'aquesta LdM o component. Deixar-lo buit si sempre és vàlid."
+msgstr "Validesa d'aquesta LdM o component. Deixar-lo buit si sempre és vàlid."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "UdV del producte"
 
@@ -1434,14 +1392,12 @@ msgstr "UdM del producte"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centre de producció"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Molt urgent"
 
@@ -1481,8 +1437,7 @@ msgid "Stockable Order Request"
 msgstr "Sol·licitud ordre estocable"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Productes planificats"
 
@@ -1510,8 +1465,7 @@ msgstr "Si el tipus de producte és estocable en ordre de proveïment"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Ordres de producció"
 
@@ -1751,8 +1705,7 @@ msgid "plus"
 msgstr "més"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Llista de materials (LdM)"
 
@@ -1796,8 +1749,7 @@ msgid "last indice"
 msgstr "Últim índex"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Revisions llista de materials"
 
@@ -1807,22 +1759,19 @@ msgid "Retry"
 msgstr "Torna a intentar"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr ""
-"Quan algú abateix productes, es converteix en les ordres de proveïment"
+msgstr "Quan algú abateix productes, es converteix en les ordres de proveïment"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1869,11 +1818,8 @@ msgid "from stock"
 msgstr "des d'estoc"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informació general"
 
@@ -1926,14 +1872,10 @@ msgid "Change Product Qty"
 msgstr "Canvia Qtat. producte"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Descripció"
@@ -1993,8 +1935,7 @@ msgid "On Stock"
 msgstr "En estoc"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2005,3 +1946,51 @@ msgstr "Seqüència"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Components de la llista de materials"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Setmana"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Càrrega centres de producció"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Càrrega del centre de producció"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Informes - Gestió MRP"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valor de l'estoc"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Càrregues centre de producció"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variació del valor de l'estoc setmanal"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variació del valor de l'estoc"
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 9d37642ebb3..cc62692e7cf 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Špatný název modelu v definici akce"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Konfigurace"
 
@@ -123,7 +121,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Invalidní XML pro zobrazení architektury!"
 
 #. module: mrp
 #: help:res.company,security_lead:0
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -864,19 +846,15 @@ msgid "Compute All Schedulers"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,cycle:0
+#: field:report.workcenter.load,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Nbr cyklu"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -976,9 +954,9 @@ msgid "Procurement Purchase"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Nbr hodiny"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1292,6 +1257,7 @@ msgstr ""
 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!"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -1319,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1387,16 +1347,12 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Pracovní centrum"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1390,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1416,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1647,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1687,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1697,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1756,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1810,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1898,9 +1841,9 @@ msgid "Bill of Material Structure"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+#: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Načíst pracovní centrum"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1928,8 +1871,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1882,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Týden"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Hlášení"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Načtení pracovních center"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Načtení pracovních center"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "MRP Správa - Hlášení"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Hodnota zásob"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Pracovní centrum načteno"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Změna týdenní hodnoty zásob"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Změna hodnoty zásob"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 0f735ab16e7..d4ae34cdc2f 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "Bestand Lagerprodukte"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Bezug"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -177,8 +175,7 @@ msgstr "Beschaffungsvorschlag"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Produktmenge"
@@ -266,8 +263,7 @@ msgid "Internal Ref."
 msgstr "Interne Referenz"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Status"
@@ -310,22 +306,19 @@ msgstr "Lagerproduktion \"vom Lager\""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Fertigungsaufträge"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Menge"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Nicht dringend"
 
@@ -371,8 +364,7 @@ msgid "Scheduled Date"
 msgstr "Geplantes Datum"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Dringend"
 
@@ -487,8 +479,7 @@ msgid "Stockable Product Stock"
 msgstr "Bestand Lagerprodukt"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "Produkt UoS"
 
@@ -614,10 +605,8 @@ msgid "Waiting"
 msgstr "Warteliste"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Reihenfolge Arbeitsvorgänge"
@@ -690,8 +679,7 @@ msgid "Production orders"
 msgstr "Fertigungsaufträge"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Hierachie Stückliste"
 
@@ -717,8 +705,7 @@ msgid "Security Days"
 msgstr "Sicherheitspuffer (Tage)"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Gesamt Zyklen"
 
@@ -781,9 +768,7 @@ msgid "Production done"
 msgstr "Beende Fertigung"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kurzbezeichnung"
@@ -795,8 +780,7 @@ msgstr "Anz. Stunden"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Eigenschaften Gruppe"
 
@@ -811,14 +795,12 @@ msgid "References"
 msgstr "Referenzen"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -902,14 +884,10 @@ msgid "Nbr of cycle"
 msgstr "Anzahl Zyklen"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
@@ -937,8 +915,8 @@ msgid ""
 msgstr ""
 "Das ermittelte Zeitfenster für die automatische Beschaffung nach "
 "Durchführung der Fertigungsplanung. Alle Beschaffungsaktionen zwischen heute "
-"und heute + Zeitfenster werden abgebrochen für zukünftige neue "
-"Berechnungen(Beschaffungsdisposition)."
+"und heute + Zeitfenster werden abgebrochen für zukünftige neue Berechnungen"
+"(Beschaffungsdisposition)."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
@@ -1025,8 +1003,7 @@ msgid "Notes"
 msgstr "Notizen"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Stückliste"
@@ -1087,8 +1064,7 @@ msgid "Sale Ref"
 msgstr "Verkaufsauftrag Ref."
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Priorität"
@@ -1117,8 +1093,7 @@ msgstr "Werkzeug"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Lagerort in dem nach weiteren Produkten gesucht wird, die in Rohmaterialien "
 "eingesetzt werden."
@@ -1155,8 +1130,7 @@ msgid "Max Quantity"
 msgstr "Max. Menge"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Beschaffung"
 
@@ -1207,8 +1181,7 @@ msgid "Procurement for raw materials."
 msgstr "Beschaffung von Bauteilen / Rohstoffe"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Bemerkung"
@@ -1236,10 +1209,8 @@ msgstr ""
 "dokumentieren."
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktiv"
 
@@ -1252,23 +1223,18 @@ msgstr "Beschaffung Produkte"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Eigenschaften"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Geplantes Fertigungsdatum"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Extra Information"
 
@@ -1319,8 +1285,7 @@ msgid "Change Product Qty."
 msgstr "Ändere Menge"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Erledigt"
 
@@ -1368,18 +1333,15 @@ msgid "Capacity per Cycle"
 msgstr "Kapazität pro Zyklus"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Gesamte Stunden"
 
@@ -1394,8 +1356,7 @@ msgid "Product BoM Structure"
 msgstr "Produktstruktur"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1418,19 +1379,16 @@ msgstr "Produktion Fertigwaren"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid "Product type is Stockable and procure method is make to stock"
-msgstr ""
-"Produkttyp ist 'Lagerprodukt' und Beschaffungsmethode ist 'vom Lager'"
+msgstr "Produkttyp ist 'Lagerprodukt' und Beschaffungsmethode ist 'vom Lager'"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Validierung der Stückliste oder Komponente. Lasse leer falls immer valide."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "Produkt UoS"
 
@@ -1442,14 +1400,12 @@ msgstr "Produkt UoM"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Arbeitsplatz"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Sehr dringend"
 
@@ -1490,8 +1446,7 @@ msgid "Stockable Order Request"
 msgstr "Lagerprodukt Beschaffungsanfrage"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Fertigungsplanung"
 
@@ -1517,8 +1472,7 @@ msgstr "Falls Typ Lagerprodukt in Beschaffungsauftrag"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Arbeitsaufträge"
 
@@ -1758,8 +1712,7 @@ msgid "plus"
 msgstr "Plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Stückliste"
 
@@ -1802,8 +1755,7 @@ msgid "last indice"
 msgstr "Letzter Index"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Stücklisten Revision"
 
@@ -1813,14 +1765,12 @@ msgid "Retry"
 msgstr "Wiederhole"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1876,11 +1826,8 @@ msgid "from stock"
 msgstr "vom Lager"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Grundinformation"
 
@@ -1933,14 +1880,10 @@ msgid "Change Product Qty"
 msgstr "Ändere Menge"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Beschreibung"
@@ -1985,8 +1928,7 @@ msgstr "Beschaffungsvorschläge Details"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
 msgid "You can see its bill of material which are used to make product"
-msgstr ""
-"Sie können die Stückliste für die Fertigung dieses Produktes einsehen."
+msgstr "Sie können die Stückliste für die Fertigung dieses Produktes einsehen."
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
@@ -1999,8 +1941,7 @@ msgid "On Stock"
 msgstr "auf Lager"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2011,3 +1952,51 @@ msgstr "Sequenz"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Komponenten"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Woche"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Berichtswesen"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Arbeitsplatz Auslastung"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Arbeitsplatz Auslastung"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Reporting Materialbeschaffungsplanung (MRP)"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Lagerwert Veränderungen"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Arbeitsplatz Auslastung"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Wöchentliche Lagerbewertung (Veränderung)"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Lagerwert Veränderungen"
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 3dd969bf3c9..20b4f8c1f8a 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -94,14 +94,12 @@ msgid "Stockable Stock"
 msgstr "Αποθηκεύσιμο Απόθεμα"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Προέλευση"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
@@ -181,8 +179,7 @@ msgstr "Αυτόματη Τροφοδοσία"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ποσ. Προϊόντος"
@@ -270,8 +267,7 @@ msgid "Internal Ref."
 msgstr "Εσωτερικές Παρ."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Κατάσταση"
@@ -313,22 +309,19 @@ msgstr "Αποθηκεύσιμο Προς Αποθήκευση"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Εντολές Παραγωγής"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Ποσότητα"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Όχι επείγον"
 
@@ -374,8 +367,7 @@ msgid "Scheduled Date"
 msgstr "Προγραμματισμένη Ημερομηνία"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Επείγον"
 
@@ -490,8 +482,7 @@ msgid "Stockable Product Stock"
 msgstr "Απόθεμα Αποθηκεύσιμου Προϊόντος"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "ΜοΠ Προϊόντος"
 
@@ -614,10 +605,8 @@ msgid "Waiting"
 msgstr "Σε Αναμονή"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Γραμμή Παραγωγής"
@@ -690,8 +679,7 @@ msgid "Production orders"
 msgstr "Εντολές Παραγωγής"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Ιεραρχία Κ.Υ."
 
@@ -717,8 +705,7 @@ msgid "Security Days"
 msgstr "Ημέρες Ασφαλείας"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Σύννολο Κύκλων"
 
@@ -779,9 +766,7 @@ msgid "Production done"
 msgstr "Παραγωγή ολοκληρώθηκε"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Κωδικός"
@@ -793,8 +778,7 @@ msgstr "Αρ. Ωρών"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Ομάδα Χαρακτηριστικών"
 
@@ -809,14 +793,12 @@ msgid "References"
 msgstr "Παραπομπές"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -900,14 +882,10 @@ msgid "Nbr of cycle"
 msgstr "Αρ. Κύκλου"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Όνομα"
 
@@ -1020,8 +998,7 @@ msgid "Notes"
 msgstr "Σημειώσεις"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Κατάσταση Υλικών"
@@ -1082,8 +1059,7 @@ msgid "Sale Ref"
 msgstr "Παρ. Πώλησης"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Προτεραιότητα"
@@ -1112,8 +1088,7 @@ msgstr "Εργαλείο"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr "Τοποθεσία όπου το σύστημα θα αναζητά πρώτες ύλες."
 
 #. module: mrp
@@ -1150,8 +1125,7 @@ msgid "Max Quantity"
 msgstr "Μέγ. Ποσότητα"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Προμήθειες"
 
@@ -1203,8 +1177,7 @@ msgid "Procurement for raw materials."
 msgstr "Προμήθεια για α' ύλες."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Σημείωση"
@@ -1230,10 +1203,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Ορίστε μια γραμμή παραγωγής για να περιγράψετε τις φάσεις παραγωγής."
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Ενεργό"
 
@@ -1246,23 +1217,18 @@ msgstr "Προμήθεια Προϊόντων"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Χαρακτηριστικά"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Προγραμματισμένη Ημερ/νία"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Επιπλέον Πληροφορίες"
 
@@ -1312,8 +1278,7 @@ msgid "Change Product Qty."
 msgstr "Αλλαγή Ποσ. Προϊόντος"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
 
@@ -1360,18 +1325,15 @@ msgid "Capacity per Cycle"
 msgstr "Ισχύς ανά Κύκλο"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Προϊόν"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Σύνολο Ωρών"
 
@@ -1386,8 +1348,7 @@ msgid "Product BoM Structure"
 msgstr "Δομή Κ.Υ. Προϊόντος"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1415,15 +1376,13 @@ msgstr ""
 "Αποθήκευση"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Εγκυρότητα της Κ.Υ. ή του συστατικού. Αφήστε το κενό αν είναι πάντα έγκυρο."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "ΜοΠ Προϊόντος"
 
@@ -1435,14 +1394,12 @@ msgstr "ΜοΜ Προϊόντος"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Κέντρο Εργασίας"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Πολύ Επείγον"
 
@@ -1482,8 +1439,7 @@ msgid "Stockable Order Request"
 msgstr "Αίτηση Παραγγελίας Αποθηκεύσιμων"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Προγραμματισμένα Προϊόντα"
 
@@ -1511,8 +1467,7 @@ msgstr "Αν ο τύπος προϊόντος είναι Αποθηκεύσιμ
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Εντολές Εργασίας"
 
@@ -1752,8 +1707,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Κ.Υ."
 
@@ -1797,8 +1751,7 @@ msgid "last indice"
 msgstr "last indice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Αναθεωρήσεις ΚΥ"
 
@@ -1808,14 +1761,12 @@ msgid "Retry"
 msgstr "Νέα προσπάθεια"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Πρόχειρη"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Κανονική"
 
@@ -1838,8 +1789,7 @@ msgstr "Αιτία Προμήθειας"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
-msgstr ""
-"Δημιουργείται κατχώρηση από την κατάσταση υλικών στη γραμμή παραγωγής"
+msgstr "Δημιουργείται κατχώρηση από την κατάσταση υλικών στη γραμμή παραγωγής"
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
@@ -1870,11 +1820,8 @@ msgid "from stock"
 msgstr "από απόθεμα"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Γενικές Πληροφορίες"
 
@@ -1927,14 +1874,10 @@ msgid "Change Product Qty"
 msgstr "Αλλαγή Ποσ. Προϊόντος"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Περιγραφή"
@@ -1994,8 +1937,7 @@ msgid "On Stock"
 msgstr "On Stock"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2007,74 +1949,106 @@ msgstr "Ιεράρχηση"
 msgid "Bill of Materials Components"
 msgstr "Περιεχόμενα Κατάστασης Υλικών"
 
-#, python-format
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Εβδομάδα"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Αναφορές"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Φόρτος κέντρων εργασίας"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Φόρτος κέντρου εργασίας"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Διαχείρηση παραγωγής - Αναφορές"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Αξία αποθέματος"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Φόρτος κέντρου εργασίας"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Εβδομαδιαία απόκλιση αξίας αποθέματος"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Απόκλιση αξίας αποθέματος"
+
 #~ msgid "Warning !"
 #~ msgstr "Προειδοποίηση!"
 
-#, python-format
 #~ msgid "Product Quantity"
 #~ msgstr "Ποσότητα Προϊόντος"
 
-#, python-format
 #~ msgid "Hours Cost"
 #~ msgstr "Κόστος Ωρών"
 
-#, python-format
 #~ msgid "Couldn't find bill of material for product"
 #~ msgstr "Αδύνατη η εύρεση συνταγολόγιου για αυτό το προϊόν"
 
-#, python-format
 #~ msgid ""
 #~ "The production is in \"%s\" state. You can not change the production "
 #~ "quantity anymore"
 #~ msgstr ""
-#~ "Η παραγωγή είναι σε κατάσταση \"%s\". Δεν μπορείτε να αλλάξετε την ποσότητα "
-#~ "παραγωγής άλλο"
+#~ "Η παραγωγή είναι σε κατάσταση \"%s\". Δεν μπορείτε να αλλάξετε την "
+#~ "ποσότητα παραγωγής άλλο"
 
 #~ msgid "UoM"
 #~ msgstr "ΜοΜ"
 
-#, python-format
 #~ msgid "No supplier defined for this product !"
 #~ msgstr "Δεν ορίστηκε προμηθευτής για το προϊόν!"
 
-#, python-format
 #~ msgid "Product name"
 #~ msgstr "Όνομα προϊόντος"
 
-#, python-format
 #~ msgid "products"
 #~ msgstr "products"
 
-#, python-format
 #~ msgid "Workcenter name"
 #~ msgstr "Όνομα κέντρου εργασίας"
 
-#, python-format
 #~ msgid "Product Standard Price"
 #~ msgstr "Καθορισμένη Τιμή Προϊόντος"
 
-#, python-format
 #~ msgid "from stock: products assigned."
 #~ msgstr "from stock: products assigned."
 
-#, python-format
 #~ msgid "from stock and no minimum orderpoint rule defined"
 #~ msgstr "from stock and no minimum orderpoint rule defined"
 
-#, python-format
 #~ msgid "No BoM defined for this product !"
 #~ msgstr "Δεν έχει οριστεί Κ.Υ. για το Προϊόν!"
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Άκυρη ενέργεια!"
 
-#, python-format
 #~ msgid "SUBTOTAL"
 #~ msgstr "Υποσύνολο"
 
-#, python-format
 #~ msgid "Unit Product Price"
 #~ msgstr "Τιμή Τεμαχίου Προϊόντος"
 
@@ -2084,29 +2058,23 @@ msgstr "Περιεχόμενα Κατάστασης Υλικών"
 #~ msgid "Create Procurement"
 #~ msgstr "Δημιουργία Προμηθειών"
 
-#, python-format
 #~ msgid "Product uom"
 #~ msgstr "ΜοΜ Προϊόντος"
 
-#, python-format
 #~ msgid "Cycles Cost"
 #~ msgstr "Κόστος Κύκλων"
 
-#, python-format
 #~ msgid "No address defined for the supplier"
 #~ msgstr "Δεν έχει οριστεί διεύθυνση συνεργάτη"
 
 #~ msgid "Production workcenters used"
 #~ msgstr "Κέντρα παραγωγής που χρησιμοποιήθηκαν"
 
-#, python-format
 #~ msgid "Product quantity"
 #~ msgstr "Ποσ. προϊόντος"
 
-#, python-format
 #~ msgid "TOTAL"
 #~ msgstr "ΣΥΝΟΛΟ"
 
-#, python-format
 #~ msgid "Product supplier"
 #~ msgstr "Ππομηθευτής προϊόντος"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index a63663a08b4..1f8f8c29006 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "Stock productos almacenables"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Origen"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -178,8 +176,7 @@ msgstr "Abastecimientos automáticos"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ctdad producto"
@@ -265,8 +262,7 @@ msgid "Internal Ref."
 msgstr "Ref. interna"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Estado"
@@ -308,22 +304,19 @@ msgstr "Almacenable obtenido para stock"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Órdenes de producción"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "No urgente"
 
@@ -369,8 +362,7 @@ msgid "Scheduled Date"
 msgstr "Fecha programada"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -487,8 +479,7 @@ msgid "Stockable Product Stock"
 msgstr "Stock de producto almacenable"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "UdV del producto"
 
@@ -614,10 +605,8 @@ msgid "Waiting"
 msgstr "En espera"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Proceso productivo"
@@ -690,8 +679,7 @@ msgid "Production orders"
 msgstr "Órdenes de producción"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Jerarquía LdM"
 
@@ -719,8 +707,7 @@ msgid "Security Days"
 msgstr "Días de seguridad"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Total ciclos"
 
@@ -781,9 +768,7 @@ msgid "Production done"
 msgstr "Producción realizada"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Código"
@@ -795,8 +780,7 @@ msgstr "Núm. de horas"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Grupo de propiedad"
 
@@ -811,14 +795,12 @@ msgid "References"
 msgstr "Referencias"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -902,14 +884,10 @@ msgid "Nbr of cycle"
 msgstr "Núm. de ciclo"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nombre"
 
@@ -936,8 +914,8 @@ msgid ""
 "skipped for futur computation."
 msgstr ""
 "Éste es el intervalo temporal analizado por el planificador al calcular "
-"abastecimientos. Todos los abastecimientos que no estén entre hoy y "
-"hoy+intervalo son omitidos para el cálculos futuros."
+"abastecimientos. Todos los abastecimientos que no estén entre hoy y hoy"
+"+intervalo son omitidos para el cálculos futuros."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
@@ -1022,8 +1000,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Lista de material"
@@ -1084,8 +1061,7 @@ msgid "Sale Ref"
 msgstr "Ref. venta"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioridad"
@@ -1114,8 +1090,7 @@ msgstr "Maquinaria"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Ubicación donde el sistema buscará productos utilizados en las materias "
 "primas."
@@ -1154,8 +1129,7 @@ msgid "Max Quantity"
 msgstr "Cantidad máx"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Abastecimiento"
 
@@ -1205,8 +1179,7 @@ msgid "Procurement for raw materials."
 msgstr "Abastecimiento para materia primas."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Nota"
@@ -1229,14 +1202,11 @@ msgstr "¿Pagado?"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Define a routing to describe the manufacturing steps."
-msgstr ""
-"Definir un proceso productivo para describir los pasos de fabricación"
+msgstr "Definir un proceso productivo para describir los pasos de fabricación"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Activo"
 
@@ -1249,31 +1219,25 @@ msgstr "Abastecer productos"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propiedades"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Fecha planificada"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Información extra"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Define the product structure, with sub-products and/or components."
-msgstr ""
-"Definir la estructura del producto, con subproductos y/o componentes."
+msgstr "Definir la estructura del producto, con subproductos y/o componentes."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -1316,8 +1280,7 @@ msgid "Change Product Qty."
 msgstr "Cambiar Ctd. producto"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Realizado"
 
@@ -1365,18 +1328,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacidad por ciclo"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Total horas"
 
@@ -1391,8 +1351,7 @@ msgid "Product BoM Structure"
 msgstr "Estructura LdM del producto"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1420,15 +1379,12 @@ msgstr ""
 "stock"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
-"Validez de esta LdM o componente. Dejarlo vacío si siempre es válido."
+msgstr "Validez de esta LdM o componente. Dejarlo vacío si siempre es válido."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "UdV del producto"
 
@@ -1440,14 +1396,12 @@ msgstr "UdM del producto"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centro de producción"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Muy urgente"
 
@@ -1487,8 +1441,7 @@ msgid "Stockable Order Request"
 msgstr "Solicitud orden almacenable"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Productos planificados"
 
@@ -1516,8 +1469,7 @@ msgstr "si el tipo de producto es almacenable en orden de abastecimiento"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Órdenes de producción"
 
@@ -1757,8 +1709,7 @@ msgid "plus"
 msgstr "más"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Lista de materiales (LdM)"
 
@@ -1803,8 +1754,7 @@ msgid "last indice"
 msgstr "Último índice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Revisiones lista de materiales"
 
@@ -1814,14 +1764,12 @@ msgid "Retry"
 msgstr "Volver a intentar"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1877,11 +1825,8 @@ msgid "from stock"
 msgstr "desde stock"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Información general"
 
@@ -1934,14 +1879,10 @@ msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Descripción"
@@ -2000,8 +1941,7 @@ msgid "On Stock"
 msgstr "En stock"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2012,3 +1952,51 @@ msgstr "Secuencia"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Componentes de la lista de materiales"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Carga centros de producción"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Catge centro de producción"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Informes - Gestión MRP"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valor del stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Cargas centro de producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variación del valor del stock semanal"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variación del valor del stock"
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index ff2a37430a9..e641b7d199d 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -123,7 +121,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML inválido para la definición de la vista !"
 
 #. module: mrp
 #: help:res.company,security_lead:0
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -864,19 +846,15 @@ msgid "Compute All Schedulers"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,cycle:0
+#: field:report.workcenter.load,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Núm. de ciclos"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -976,9 +954,9 @@ msgid "Procurement Purchase"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Núm. de horas"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propiedades"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1292,6 +1257,8 @@ msgstr ""
 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!"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -1319,18 +1286,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1309,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1333,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1387,16 +1348,12 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Centro de producción"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1898,9 +1842,9 @@ msgid "Bill of Material Structure"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+#: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Carga del centro de producción"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Informes"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Carga de centros de producción"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Carga del centro de producción"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Gestión MRP - Informes"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valor del stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Cargas de centro de producción"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variación del valor del stock semanal"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variación del valor del stock"
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index c8314f06acb..f52605c5afc 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr "Ladustatav toode"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Allikas"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Seadistus"
 
@@ -170,8 +168,7 @@ msgstr "Automaatsed hanked"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Toote kogus"
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr "Sisemine viide"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Staatus"
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Tootmiskorraldused"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Kogus"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Pole kiire"
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Kiireloomuline"
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "Toote MüÜ"
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr "Ootel"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Marsruutimine"
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr "Tootmiskorraldused"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr "Turvalised Päevad"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Kokku tsükkleid"
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr "Tootmine valmis"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Tootekood"
@@ -764,8 +749,7 @@ msgstr "Nr. Tunde"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Kinnisvara grupp"
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr "Viited"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -871,14 +853,10 @@ msgid "Nbr of cycle"
 msgstr "Tsükkli number"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -988,8 +966,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1050,8 +1027,7 @@ msgid "Sale Ref"
 msgstr "Müügiselgitus"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioriteet"
@@ -1080,8 +1056,7 @@ msgstr "Tööriist"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1116,8 +1091,7 @@ msgid "Max Quantity"
 msgstr "Maks kogus"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Hankimine"
 
@@ -1167,8 +1141,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Märkus"
@@ -1194,10 +1167,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Defineeri teekonnad kirjeldamaks tootmise samme."
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktiivne"
 
@@ -1210,23 +1181,18 @@ msgstr "Hangi tooted"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Omadused"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Lisainfo"
 
@@ -1274,8 +1240,7 @@ msgid "Change Product Qty."
 msgstr "Muuda tootekogust"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Valmis"
 
@@ -1322,18 +1287,15 @@ msgid "Capacity per Cycle"
 msgstr "Võimekus tsükklikohta"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Toode"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Tunnid kokku"
 
@@ -1348,8 +1310,7 @@ msgid "Product BoM Structure"
 msgstr "Tooteühikute struktuur"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1373,14 +1334,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1392,14 +1351,12 @@ msgstr "Toote mõõtühik"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Töökeskkond"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Väga kiireloomuline"
 
@@ -1437,8 +1394,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1464,8 +1420,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1696,8 +1651,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1737,8 +1691,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1748,14 +1701,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1809,11 +1760,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1866,14 +1814,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1901,9 +1845,9 @@ msgid "Bill of Material Structure"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+#: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Töökeskonna koormus"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1931,8 +1875,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1943,3 +1886,51 @@ msgstr "Järjekord"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Kaubakoosluse komponendid"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Nädal"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Aruandlus"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Töökeskkonna koormus"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Töökeskkonna Koormus"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "TVP haldus - Aruandlus"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Lao suurus"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Töökeskuse Koormused"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Nädalased laoväärtuse muutused"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Laoväärtuse muutused"
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 1186647af11..fc4d77bbc7b 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -17,14 +17,12 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "UdV du produit"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -111,14 +109,12 @@ msgid "Stockable Stock"
 msgstr "Stock de produit stockable"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Origine"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -198,8 +194,7 @@ msgstr "Approvisionnements Automatiques"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Qté de Produit"
@@ -287,8 +282,7 @@ msgid "Internal Ref."
 msgstr "Réf. Interne"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "État"
@@ -330,22 +324,19 @@ msgstr "Sur stock stockable"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Ordres de Production"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Quantité"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Non urgent"
 
@@ -391,8 +382,7 @@ msgid "Scheduled Date"
 msgstr "Date planifiée"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgent"
 
@@ -591,8 +581,7 @@ msgstr "Planification des Ordres de Production"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr ""
-"Facteur multipliant tous les temps exprimés dans le centre de travail."
+msgstr "Facteur multipliant tous les temps exprimés dans le centre de travail."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -629,10 +618,8 @@ msgid "Waiting"
 msgstr "En attente"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Gamme"
@@ -705,8 +692,7 @@ msgid "Production orders"
 msgstr "Ordres de Production"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Hiérarchie de la Nomenclature des Matériaux"
 
@@ -734,8 +720,7 @@ msgid "Security Days"
 msgstr "Jours de sécurité"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Cycles Totaux"
 
@@ -782,8 +767,7 @@ msgstr "Ordre de Service Stockable"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
 msgid "From minimum stock rules, it goes for procure product."
-msgstr ""
-"Des règles de stock minimal, il mène à l'approvisionnement du produit."
+msgstr "Des règles de stock minimal, il mène à l'approvisionnement du produit."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -797,9 +781,7 @@ msgid "Production done"
 msgstr "Production Effectuée"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Code"
@@ -811,8 +793,7 @@ msgstr "Nombre d'Heures"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Groupe de Propriétés"
 
@@ -827,14 +808,12 @@ msgid "References"
 msgstr "Références"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -918,14 +897,10 @@ msgid "Nbr of cycle"
 msgstr "Nbre de cycles"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nom"
 
@@ -1039,8 +1014,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Nomenclature"
@@ -1101,8 +1075,7 @@ msgid "Sale Ref"
 msgstr "Réf. Vente"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Priorité"
@@ -1131,8 +1104,7 @@ msgstr "Outil"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Emplacement où le système recherchera les produits utilisés dans les "
 "matériaux bruts."
@@ -1171,8 +1143,7 @@ msgid "Max Quantity"
 msgstr "Quantité Max"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Approvisionnement"
 
@@ -1222,8 +1193,7 @@ msgid "Procurement for raw materials."
 msgstr "Approvisionnement pour les matériaux bruts."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Note"
@@ -1249,10 +1219,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Défini un routage pour décrire les étapes de la production"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Actif"
 
@@ -1265,23 +1233,18 @@ msgstr "Approvisionnement produit"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propriétés"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Date prévue"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Information supplémentaire"
 
@@ -1331,8 +1294,7 @@ msgid "Change Product Qty."
 msgstr "Changer la Qté de Produit"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Terminé"
 
@@ -1382,18 +1344,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacité par Cycle"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produit"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Heures Totales"
 
@@ -1427,29 +1386,25 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr "Type de produit \"stockable\" et approvisionnement \"sur stock\""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Validité de cette nomenclature ou composant. Laissez vide si toujours valide."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "US produit"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centre de Travail"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "très Urgent"
 
@@ -1489,8 +1444,7 @@ msgid "Stockable Order Request"
 msgstr "Demande de Commande Stockable"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Produits Plannifiés"
 
@@ -1519,8 +1473,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Ordres de Travail"
 
@@ -1558,9 +1511,9 @@ msgstr ""
 "Utiliser une nomenclature fantôme pour les lignes de matières premières qui "
 "doivent être automatiquement calculées sur les ordres de productions et non "
 "pas une par niveau. Si vous précisez \"Nomenclature fantôme\" au premier "
-"niveau de la nomenclature, elle sera considérée comme un ensemble ou un pack "
-": les produits seront remplacés par les composants entre les commandes de "
-"ventes et le colisage sans ordre de production. La nomenclature normale "
+"niveau de la nomenclature, elle sera considérée comme un ensemble ou un "
+"pack : les produits seront remplacés par les composants entre les commandes "
+"de ventes et le colisage sans ordre de production. La nomenclature normale "
 "générera un ordre de production par niveau de nomenclature."
 
 #. module: mrp
@@ -1760,8 +1713,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Nomenclature"
 
@@ -1805,8 +1757,7 @@ msgid "last indice"
 msgstr "Dernier Indice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Révisions des Nomenclatures"
 
@@ -1816,14 +1767,12 @@ msgid "Retry"
 msgstr "Réessayez"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1879,11 +1828,8 @@ msgid "from stock"
 msgstr "du stock"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Infos générales"
 
@@ -1936,14 +1882,10 @@ msgid "Change Product Qty"
 msgstr "Changer la Qté de Produits"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Description"
@@ -2003,8 +1945,7 @@ msgid "On Stock"
 msgstr "Sur Stock"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2015,3 +1956,51 @@ msgstr "Séquence"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Composants de la Nomenclature"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semaine"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Reporting"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Charge des centres de travail"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Charge par poste"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valeur de stoque"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Charges du Centre de Travail"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variation de valeur de stock hebdomadaire"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variation de la valeur de stock"
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 6a7203b95c0..67e3880a274 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji Radnje."
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -123,7 +121,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: mrp
 #: help:res.company,security_lead:0
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -864,19 +846,15 @@ msgid "Compute All Schedulers"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,cycle:0
+#: field:report.workcenter.load,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Broj Ciklusa"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -976,9 +954,9 @@ msgid "Procurement Purchase"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Broj Sati"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1292,6 +1257,7 @@ msgstr ""
 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 !"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -1319,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1387,16 +1347,12 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Radni Centar"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1390,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1416,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1647,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1687,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1697,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1756,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1810,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1898,9 +1841,9 @@ msgid "Bill of Material Structure"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
+#: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Teret Radnog Centra"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1928,8 +1871,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1882,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Tjedni"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Izvještavanje"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Teret Radnih Centara"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Teret Radnog Centra"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Upravljanje Proizvodnjom - Izvještavanje"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Vrijednost Zalihe"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Tereti Radnog Centra"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Tjedna Varijacija Vrijednosti Zalihe"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Varijacija vrijednosti Zalihe"
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 729561da719..65ac858099e 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 3345be80cbd..e566224d17e 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Pelaporan"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 598cdfbe9ac..3b6d90d187c 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "Materiale gestito a scorta"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Rif. documento"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -178,8 +176,7 @@ msgstr "Approvvigionamento automatico"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Quantità"
@@ -266,8 +263,7 @@ msgid "Internal Ref."
 msgstr "Rif. Interno"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Stato"
@@ -310,22 +306,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Ordini di Produzione"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Quantità"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Non Urgente"
 
@@ -371,8 +364,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -489,8 +481,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "Unità di Vendita Prodotto"
 
@@ -577,8 +568,7 @@ msgstr "Pianificazione Ordini di Produzione"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr ""
-"Coefficiente per aumentare tutti i tempi espressi nel centro di lavoro"
+msgstr "Coefficiente per aumentare tutti i tempi espressi nel centro di lavoro"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -613,10 +603,8 @@ msgid "Waiting"
 msgstr "In attesa"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Ciclo di Lavoro"
@@ -690,8 +678,7 @@ msgid "Production orders"
 msgstr "Ordini di Produzione"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Struttura Distinta Base"
 
@@ -719,8 +706,7 @@ msgid "Security Days"
 msgstr "Giorni di Sicurezza"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Cicli totali"
 
@@ -781,9 +767,7 @@ msgid "Production done"
 msgstr "Produzione Completata"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Codice"
@@ -795,8 +779,7 @@ msgstr "N. Ore"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Gruppo di Proprietà"
 
@@ -811,14 +794,12 @@ msgid "References"
 msgstr "Riferimenti"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -900,14 +881,10 @@ msgid "Nbr of cycle"
 msgstr "Numero Ciclo"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Descrizione"
 
@@ -1017,8 +994,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Distinta Base"
@@ -1079,8 +1055,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Priorità"
@@ -1109,8 +1084,7 @@ msgstr "Strumento"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Ubicazione dove il sistema andrà a cercare i prodotti utilizzati come "
 "materia prima."
@@ -1149,8 +1123,7 @@ msgid "Max Quantity"
 msgstr "Quantità Massima"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Approvvigionamento"
 
@@ -1200,8 +1173,7 @@ msgid "Procurement for raw materials."
 msgstr "Approvvigionamento di materie prime."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Nota"
@@ -1227,10 +1199,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Definisci un ciclo di lavoro per descrivere la sequenza produttiva"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Attivo"
 
@@ -1243,23 +1213,18 @@ msgstr "Approvvigiona i prodotti"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Proprietà"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Data Programmata"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Informazioni Aggiuntive"
 
@@ -1310,8 +1275,7 @@ msgid "Change Product Qty."
 msgstr "Cambia la quantità del prodotto"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Completato"
 
@@ -1361,18 +1325,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacità per Ciclo"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Prodotto"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Ore Totali"
 
@@ -1387,8 +1348,7 @@ msgid "Product BoM Structure"
 msgstr "Struttura Distinta Base Prodotto"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1414,16 +1374,14 @@ msgstr ""
 "Stock\" (produrre per far scorta)"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Validità di questa distinta base o componente. Lasciare vuoto se è sempre "
 "valida/o."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "Unità di Vendita"
 
@@ -1435,14 +1393,12 @@ msgstr "Unità di Misura"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centro di Lavoro"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Molto Urgente"
 
@@ -1482,8 +1438,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Prodotti Programmati"
 
@@ -1511,8 +1466,7 @@ msgstr "Se nell'ordine di approvvigionamento il prodotto è gestito a scorta"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Ordini di Lavorazione"
 
@@ -1752,8 +1706,7 @@ msgid "plus"
 msgstr "più"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Distinta base"
 
@@ -1798,8 +1751,7 @@ msgid "last indice"
 msgstr "Ultimo Indice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Revisioni Distinta Base"
 
@@ -1809,14 +1761,12 @@ msgid "Retry"
 msgstr "Riprova"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Bozza"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normale"
 
@@ -1870,11 +1820,8 @@ msgid "from stock"
 msgstr "da Scorte"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informazioni Generali"
 
@@ -1927,14 +1874,10 @@ msgid "Change Product Qty"
 msgstr "Cambia la quantità del prodotto"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Descrizione"
@@ -1994,8 +1937,7 @@ msgid "On Stock"
 msgstr "A scorta"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -2006,3 +1948,51 @@ msgstr "Sequenza"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Componenti Distinta Base"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Settimana"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Reportistica"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Carico Laboratori"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Carico Laboratorio"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valore Stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Carichi Laboratorio"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variazione Settimanale Valore Stock"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variazione Valore Stock"
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 4eb054f4ce2..fa2e34a5917 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -34,8 +34,8 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
-"가상 재고가 0 이하인 모든 제품에 대해 자동 조달 프로세스가 작동되는 트리거. 이 옵션보다는 제품에 대한 MTO 구성을 이용하시길 "
-"권합니다."
+"가상 재고가 0 이하인 모든 제품에 대해 자동 조달 프로세스가 작동되는 트리거. "
+"이 옵션보다는 제품에 대한 MTO 구성을 이용하시길 권합니다."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "재고"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "기원"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "구성"
 
@@ -160,7 +158,8 @@ msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
-"이 워크센터가 병렬처리할 수 있는 오퍼레이션의 수. 워크 센터가 5명의 작업자로 구성된 팀일 경우, 사이클당 생산용량은 5입니다."
+"이 워크센터가 병렬처리할 수 있는 오퍼레이션의 수. 워크 센터가 5명의 작업자로 "
+"구성된 팀일 경우, 사이클당 생산용량은 5입니다."
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
@@ -174,8 +173,7 @@ msgstr "자동 조달"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "상품 수량"
@@ -261,8 +259,7 @@ msgid "Internal Ref."
 msgstr "내부 참조"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "상태"
@@ -293,7 +290,9 @@ msgstr "주문 서비스"
 msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
-msgstr "가상 재고가 최소 수량 이하로 떨어지면, Linkr는 가상 재고를 최대 수량으로 증가시킬 조달 프로세스를 생성합니다."
+msgstr ""
+"가상 재고가 최소 수량 이하로 떨어지면, Linkr는 가상 재고를 최대 수량으로 증가"
+"시킬 조달 프로세스를 생성합니다."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
@@ -302,22 +301,19 @@ msgstr "재고 생산"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "상품 주문"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "수량"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "긴급하지 않음"
 
@@ -363,8 +359,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "긴급"
 
@@ -386,8 +381,9 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"완제품이 필요한 곳에서 생산할 경우에는 비워 두십시오. 고정된 위치에서 생산할 경우, 위치를 설정하십시오. 생산 오퍼레이션을 하청 "
-"계약으로 수행할 경우에는 파트너의 위치가 적용될 수도 있습니다."
+"완제품이 필요한 곳에서 생산할 경우에는 비워 두십시오. 고정된 위치에서 생산할 "
+"경우, 위치를 설정하십시오. 생산 오퍼레이션을 하청 계약으로 수행할 경우에는 파"
+"트너의 위치가 적용될 수도 있습니다."
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
@@ -435,7 +431,8 @@ msgstr "수정 날짜"
 msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
-msgstr "생산 주문에 따라 자동적으로 분석 회계 엔트리를 생성하려면, 이를 작성하십시오."
+msgstr ""
+"생산 주문에 따라 자동적으로 분석 회계 엔트리를 생성하려면, 이를 작성하십시오."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -473,8 +470,7 @@ msgid "Stockable Product Stock"
 msgstr "재고"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "상품 UOS"
 
@@ -594,10 +590,8 @@ msgid "Waiting"
 msgstr "대기"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "라우팅"
@@ -670,8 +664,7 @@ msgid "Production orders"
 msgstr "생산 주문"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "BoM 계층구조"
 
@@ -697,8 +690,7 @@ msgid "Security Days"
 msgstr "안전 기간 (일)"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "총 사이클"
 
@@ -727,7 +719,9 @@ msgstr "예외"
 msgid ""
 "This wizard will planify the procurement for this product. This procurement "
 "may generate task, production orders or purchase orders."
-msgstr "이 위저드는 이 상품의 조달 계획을 작성합니다. 조달 프로세스는 과제, 생산 주문 또는 구매 주문을 생성합니다."
+msgstr ""
+"이 위저드는 이 상품의 조달 계획을 작성합니다. 조달 프로세스는 과제, 생산 주"
+"문 또는 구매 주문을 생성합니다."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
@@ -756,9 +750,7 @@ msgid "Production done"
 msgstr "생산 완료"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "코드"
@@ -770,8 +762,7 @@ msgstr "시간"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "속성 그룹"
 
@@ -786,14 +777,12 @@ msgid "References"
 msgstr "참조"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -875,14 +864,10 @@ msgid "Nbr of cycle"
 msgstr "사이클 수"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "이름"
 
@@ -908,7 +893,8 @@ msgid ""
 "procurements. All procurement that are not between today and today+range are "
 "skipped for futur computation."
 msgstr ""
-"조달을 계산할 때 스케줄러에 의해 분석되는 시간 프레임입니다. 오늘과 오늘+범위 사이에 있지 않은 모든 조달이 향후 계산에서 제외됩니다."
+"조달을 계산할 때 스케줄러에 의해 분석되는 시간 프레임입니다. 오늘과 오늘+범"
+"위 사이에 있지 않은 모든 조달이 향후 계산에서 제외됩니다."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
@@ -993,8 +979,7 @@ msgid "Notes"
 msgstr "노트"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "BOM"
@@ -1055,8 +1040,7 @@ msgid "Sale Ref"
 msgstr "판매 참조"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "우선순위"
@@ -1085,8 +1069,7 @@ msgstr "툴"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr "시스템이 원재료를 찾는 장소"
 
 #. module: mrp
@@ -1121,8 +1104,7 @@ msgid "Max Quantity"
 msgstr "최대 수량"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "조달"
 
@@ -1172,8 +1154,7 @@ msgid "Procurement for raw materials."
 msgstr "원재료 조달"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "노트"
@@ -1199,10 +1180,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "생산 단계를 기술할 라우팅 정의"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "활성"
 
@@ -1215,23 +1194,18 @@ msgstr "상품 조달"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "속성"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "계획된 날짜"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "추가 정보"
 
@@ -1279,8 +1253,7 @@ msgid "Change Product Qty."
 msgstr "상품 수량 변경"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "완료"
 
@@ -1326,18 +1299,15 @@ msgid "Capacity per Cycle"
 msgstr "사이클당 생산용량"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "상품"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "총 시간"
 
@@ -1352,8 +1322,7 @@ msgid "Product BoM Structure"
 msgstr "상품 BoM 구조"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1379,14 +1348,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr "상품 유형이 재고성이며, 조달 방식이 '재고 생산'"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr "이 BoM 또는 부품의 유효성. 항상 유효할 경우에는 비워 두십시오."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "상품 UoS"
 
@@ -1398,14 +1365,12 @@ msgstr "상품 UoM"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "워크센터"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "매우 긴급"
 
@@ -1443,8 +1408,7 @@ msgid "Stockable Order Request"
 msgstr "재고성 주문 요청"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "계획된 상품"
 
@@ -1470,8 +1434,7 @@ msgstr "상품 유형이 조달 주문에서 재고성일 경우"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "작업 지시"
 
@@ -1506,9 +1469,11 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
-"레벨 당 하나가 아니라, 하나의 생산 주문에서 자동 계산되어야 하는 원재료 라인 속의 팬텀 BoM을 이용하십시오. BOM의 루트 레벨에 "
-"\"팬텀/세트\"을 두면, 세트나 팩으로 간주됩니다: 상품은 생산 주문을 통하지 않고, 판매 오더에서 피킹 사이에 컴포넌트로 대체됩니다. "
-"일반 BoM은 각 BoM 레벨 마다 하나의 생산 주문을 생성합니다."
+"레벨 당 하나가 아니라, 하나의 생산 주문에서 자동 계산되어야 하는 원재료 라인 "
+"속의 팬텀 BoM을 이용하십시오. BOM의 루트 레벨에 \"팬텀/세트\"을 두면, 세트나 "
+"팩으로 간주됩니다: 상품은 생산 주문을 통하지 않고, 판매 오더에서 피킹 사이에 "
+"컴포넌트로 대체됩니다. 일반 BoM은 각 BoM 레벨 마다 하나의 생산 주문을 생성합"
+"니다."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1705,8 +1670,7 @@ msgid "plus"
 msgstr "더하기"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "BoM"
 
@@ -1718,8 +1682,9 @@ msgid ""
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
 msgstr ""
-"완제품 생산을 위한 오퍼레이션 리스트 (워크센터 리스트). 이 라우팅은 주로 오퍼레이션 중의 워크센터 원가 계산과 생산 계획에 기초한 "
-"워크센터 부하량을 계획하는데 이용됩니다."
+"완제품 생산을 위한 오퍼레이션 리스트 (워크센터 리스트). 이 라우팅은 주로 오퍼"
+"레이션 중의 워크센터 원가 계산과 생산 계획에 기초한 워크센터 부하량을 계획하"
+"는데 이용됩니다."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1748,8 +1713,7 @@ msgid "last indice"
 msgstr "마지막 인덱스"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "BoM 리비전"
 
@@ -1759,14 +1723,12 @@ msgid "Retry"
 msgstr "다시 시도"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "초안"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "보통"
 
@@ -1820,11 +1782,8 @@ msgid "from stock"
 msgstr "재고로부터"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "일반 정보"
 
@@ -1877,14 +1836,10 @@ msgid "Change Product Qty"
 msgstr "상품 수량 변경"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "설명"
@@ -1942,8 +1897,7 @@ msgid "On Stock"
 msgstr "재고"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1955,104 +1909,129 @@ msgstr "시퀀스"
 msgid "Bill of Materials Components"
 msgstr "BoM 컴포넌트"
 
-#, python-format
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
 #~ msgid "Warning !"
 #~ msgstr "경고 !"
 
-#, python-format
 #~ msgid "Product name"
 #~ msgstr "제품 이름"
 
-#, python-format
 #~ msgid "products"
 #~ msgstr "상품"
 
-#, python-format
 #~ msgid "Workcenter name"
 #~ msgstr "워크센터 이름"
 
-#, python-format
 #~ msgid "Product Standard Price"
 #~ msgstr "상품 표준 가격"
 
-#, python-format
 #~ msgid "Product Quantity"
 #~ msgstr "상품 수량"
 
-#, python-format
 #~ msgid "No BoM defined for this product !"
 #~ msgstr "이 상품에 정의된 BoM이 없습니다 !"
 
-#, python-format
 #~ msgid "Hours Cost"
 #~ msgstr "시간 원가"
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "유효하지 않은 액션 !"
 
-#, python-format
 #~ msgid "Couldn't find bill of material for product"
 #~ msgstr "상품의 BoM을 찾을 수 없습니다"
 
-#, python-format
 #~ msgid "SUBTOTAL"
 #~ msgstr "소계"
 
-#, python-format
 #~ msgid "Unit Product Price"
 #~ msgstr "단위 상품 가격"
 
 #~ msgid "Qty"
 #~ msgstr "수량"
 
-#, python-format
 #~ msgid "Product uom"
 #~ msgstr "상품 UoM"
 
 #~ msgid "Create Procurement"
 #~ msgstr "조달 생성"
 
-#, python-format
 #~ msgid "Cycles Cost"
 #~ msgstr "사이클 원가"
 
-#, python-format
 #~ msgid "No address defined for the supplier"
 #~ msgstr "이 공급자의 주소가 없음"
 
 #~ msgid "Production workcenters used"
 #~ msgstr "이용된 생산 워크센터"
 
-#, python-format
 #~ msgid "Product quantity"
 #~ msgstr "상품 수량"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "에러"
 
-#, python-format
 #~ msgid "Product supplier"
 #~ msgstr "상품 공급자"
 
-#, python-format
 #~ msgid "TOTAL"
 #~ msgstr "총"
 
-#, python-format
 #~ msgid "No supplier defined for this product !"
 #~ msgstr "이 체품에 할당된 공급자가 없음 !"
 
-#, python-format
 #~ msgid "from stock: products assigned."
 #~ msgstr "재고로부터: 할당된 상품"
 
-#, python-format
 #~ msgid "from stock and no minimum orderpoint rule defined"
 #~ msgstr "재고로부터, 그리고 최소 주문포인트 규칙이 정의되지 않음"
 
-#, python-format
 #~ msgid ""
 #~ "The production is in \"%s\" state. You can not change the production "
 #~ "quantity anymore"
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 98023cfefed..440032f566a 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Nustatymai"
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 755dd3792a2..bd5bcdb2587 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -1898,3 +1898,56 @@ msgstr ""
 msgid "Bill of Materials Components"
 msgstr ""
 
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next production orders"
+msgstr ""
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index a4ffcb1c975..8f67b13344b 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 22:08+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"PO-Revision-Date: 2010-07-05 08:42+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -50,7 +50,7 @@ msgstr "Ongeldige modelnaam in de actie-definitie."
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr "Versie"
+msgstr "Revisie"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
@@ -67,7 +67,7 @@ msgstr "Haperingen in verwervingen"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr "Routeren werkplaatsen"
+msgstr "Routing werkcentra"
 
 #. module: mrp
 #: help:mrp.property,composition:0
@@ -94,7 +94,7 @@ msgstr "Op voorraad te nemen voorraad"
 #: field:mrp.procurement,origin:0
 #: field:mrp.production,origin:0
 msgid "Origin"
-msgstr "Afkomst"
+msgstr "Oorsprong"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
@@ -121,7 +121,7 @@ msgstr "Automatisch bestelpunt"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr ""
+msgstr "Set / Pack"
 
 #. module: mrp
 #: constraint:ir.ui.view:0
@@ -254,7 +254,7 @@ msgstr "u kunt de minimale voorraad regels voor het product zien"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr ""
+msgstr "Sets / Phantom"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
@@ -286,7 +286,7 @@ msgstr "Refereert aan een positie in een extern plan."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "Stockable Request"
-msgstr ""
+msgstr "Voorraad aanvraag"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceonorder0
@@ -307,7 +307,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Stockable Make to Stock"
-msgstr ""
+msgstr "Voorraad - maak op voorraad"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -485,7 +485,7 @@ msgstr "Auteur"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Stockable Product Stock"
-msgstr ""
+msgstr "Voorraad productvoorraad"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -516,17 +516,17 @@ msgstr "Laatste fout"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "Materiaallijstregels"
+msgstr "Stuklijstregels"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "Opzettijd prod."
+msgstr "Tijd vóór prod."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Routing workcenter usage"
-msgstr "Gebruik routering werkplaats"
+msgstr "Routing werkcenter gebruik"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -536,7 +536,7 @@ msgstr "Verbruikte producten"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr "Fout! U kunt geen recursieve materialenlijst aanmaken."
+msgstr "Fout! U kunt geen recursieve stuklijst aanmaken."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -565,7 +565,7 @@ msgstr "Gereed"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr "Handelingen werkplaats"
+msgstr "Werkcenter operaties"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
@@ -604,7 +604,7 @@ msgstr "In productie"
 #. module: mrp
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr "Hvh meervoudig"
+msgstr "Hvh veelvoud"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -618,7 +618,7 @@ msgstr "Wachtend"
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Routering"
+msgstr "Routing"
 
 #. module: mrp
 #: wizard_button:mrp.workcenter.load,init,report:0
@@ -665,7 +665,7 @@ msgstr "Offerteverzoek"
 #. module: mrp
 #: field:mrp.bom,revision_type:0
 msgid "indice type"
-msgstr "Soort index"
+msgstr "Indextype"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
@@ -731,17 +731,17 @@ msgstr "Gereed voor productie"
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr "Naam wijziging"
+msgstr "Naamswijziging"
 
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "Soort materiaallijst"
+msgstr "Stuklijstsoort"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Exception"
-msgstr "Fout"
+msgstr "Uitzondering"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
@@ -760,7 +760,7 @@ msgstr "Het systeem wacht op de gevraagde producten uit voorraad"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemto0
 msgid "Serivce Stockable Order"
-msgstr ""
+msgstr "Service voorraad order"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -801,7 +801,7 @@ msgstr "Eigenschappengroep"
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr "Hoofd materiaallijst"
+msgstr "Bron stuklijst"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -825,7 +825,7 @@ msgstr "Annuleren"
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr ""
+msgstr "Verplaats product"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -950,7 +950,7 @@ msgstr "Veiligheidsmarge in dagen voor elke productiehandeling."
 #. module: mrp
 #: wizard_view:mrp.procurement.compute.all,init:0
 msgid "Scheduler Parameters"
-msgstr "Parameters planner"
+msgstr "Planningsparameters"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -1024,12 +1024,12 @@ msgstr "Opmerkingen"
 #: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
-msgstr "Materialenlijst"
+msgstr "Stuklijst"
 
 #. module: mrp
 #: wizard_view:mrp.workcenter.load,init:0
 msgid "Select time unit"
-msgstr "Kies tijdseenheid"
+msgstr "Selecteer tijdseenheid"
 
 #. module: mrp
 #: wizard_field:product_price,init,number:0
@@ -1195,7 +1195,7 @@ msgstr "Kostenplaats uren"
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "alphabetical indices"
-msgstr "Alfabetische indices"
+msgstr "Alfabetische index"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
@@ -1293,7 +1293,7 @@ msgstr "Algemene rekening"
 #. module: mrp
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr "Eigenschappen samenstelling"
+msgstr "Samenstellingseigenschappen"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1327,7 +1327,7 @@ msgstr ""
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr "Hersorteringsmodus"
+msgstr "Herbestel modus"
 
 #. module: mrp
 #: constraint:ir.model:0
@@ -1393,7 +1393,7 @@ msgstr "Materiaallijst product"
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr "Product ME"
+msgstr "Product UOM"
 
 #. module: mrp
 #: help:mrp.procurement,origin:0
@@ -1441,7 +1441,7 @@ msgstr "Product ME"
 #: field:mrp.routing.workcenter,workcenter_id:0
 #: view:mrp.workcenter:0
 msgid "Workcenter"
-msgstr "Werkplaats"
+msgstr "Werkcenter"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -1453,7 +1453,7 @@ msgstr "Zeer urgent"
 #: field:mrp.procurement,purchase_id:0
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Purchase Order"
-msgstr "Bestelopdracht"
+msgstr "Inkooporder"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1482,7 +1482,7 @@ msgstr "Bronlocatie"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 msgid "Stockable Order Request"
-msgstr ""
+msgstr "Aanvraag voorraadorder"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1498,7 +1498,7 @@ msgstr "Productie verbruiksartikelen"
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "numeric indices"
-msgstr "Numerieke indices"
+msgstr "Numerieke indexen"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1526,7 +1526,7 @@ msgstr "Kosten per cyclus"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of material revisions"
-msgstr "Materialenlijstversies"
+msgstr "Stuklijstversies"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -1579,7 +1579,7 @@ msgstr "Intern verwervingsverzoek"
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr "Productie-opdracht"
+msgstr "Productieorder"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1618,7 +1618,7 @@ msgstr "Geldig tot"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr "Tijdelijke verwervingsfouten"
+msgstr "Tijdelijke verwervingsuitzonderingen"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1628,7 +1628,7 @@ msgstr "Geldig vanaf"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "Normale materialenlijst"
+msgstr "Normale stuklijst"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1655,7 +1655,7 @@ msgstr "Bevestigen"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Workcenters Utilisation"
-msgstr "Belasting werkplaatsen"
+msgstr "Belasting werkcenters"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
@@ -1705,7 +1705,7 @@ msgstr "Nieuwe materiaallijst"
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr "Afbouwtijd"
+msgstr "Tijd na prod."
 
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,time_unit:0
@@ -1736,7 +1736,7 @@ msgstr "Eigenschap"
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr "Hoofdroutering"
+msgstr "Hoofdrouting"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -1757,7 +1757,7 @@ msgstr "plus"
 #: field:mrp.bom.revision,bom_id:0
 #: field:mrp.procurement,bom_id:0
 msgid "BoM"
-msgstr "Materiaallijst"
+msgstr "Stuklijst"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1775,7 +1775,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Waiting Goods"
-msgstr "Wacht op materiaal"
+msgstr "Wacht op materialen"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
@@ -1803,7 +1803,7 @@ msgstr "laatste index"
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr "Materiaallijstversies"
+msgstr "Stuklijstversies"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -2008,3 +2008,56 @@ msgstr "Reeks"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Onderdelen materiaallijst"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Week"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Rapportering"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Werkcentersbelasting"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Werkcenterbelasting"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "MRP beheer - Rapportage"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Voorraadwaarde"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Werkcenterbelastingen"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Wekelijkse voorraadwaarde variatie"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Voorraadwaarde variatie"
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Volgende productieorders"
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index bb43dcb8cba..54566f3cf31 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1320,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1346,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1371,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1390,14 +1349,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1435,8 +1392,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1462,8 +1418,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1694,8 +1649,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1735,8 +1689,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1746,14 +1699,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1807,11 +1758,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1864,14 +1812,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1929,8 +1873,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1941,3 +1884,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 344b3d8afa9..5c744899ee2 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -91,14 +91,12 @@ msgid "Stockable Stock"
 msgstr "Zapas rejestrowany"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Pochodzenie"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -177,8 +175,7 @@ msgstr "Automatyczne nabycia"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ilość produktu"
@@ -265,8 +262,7 @@ msgid "Internal Ref."
 msgstr "Wewn. odnośnik"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Stan"
@@ -308,22 +304,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Zamówienia produkcji"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Ilość"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Nie pilne"
 
@@ -369,8 +362,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Pilne"
 
@@ -486,8 +478,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "JS produktu"
 
@@ -611,10 +602,8 @@ msgid "Waiting"
 msgstr "Oczekiwanie"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Marszruta"
@@ -687,8 +676,7 @@ msgid "Production orders"
 msgstr "Zamówienia produkcji"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Hierarchia Zest. Mat."
 
@@ -714,8 +702,7 @@ msgid "Security Days"
 msgstr "Dni na wszelki wypadek"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Suma cykli"
 
@@ -775,9 +762,7 @@ msgid "Production done"
 msgstr "Produkcja wykonana"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kod"
@@ -789,8 +774,7 @@ msgstr "Liczba godzin"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Grupa właściwości"
 
@@ -805,14 +789,12 @@ msgid "References"
 msgstr "Odnośniki"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -894,14 +876,10 @@ msgid "Nbr of cycle"
 msgstr "Liczba cykli"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nazwa"
 
@@ -1014,8 +992,7 @@ msgid "Notes"
 msgstr "Uwagi"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Zestawienie materiałowe"
@@ -1076,8 +1053,7 @@ msgid "Sale Ref"
 msgstr "Odnośnik sprzedaży"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Priorytet"
@@ -1106,8 +1082,7 @@ msgstr "Narzędzie"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "Strefa, w której system oczekuje produktów jako materiałów do produkcji."
 
@@ -1143,8 +1118,7 @@ msgid "Max Quantity"
 msgstr "Ilość maks."
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Nabycie"
 
@@ -1194,8 +1168,7 @@ msgid "Procurement for raw materials."
 msgstr "Nabycie dla materiałów do produkcji."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Uwaga"
@@ -1221,10 +1194,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Zdefiniuj marszrutę, aby opisać kroki produkcyjne."
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktywne"
 
@@ -1237,23 +1208,18 @@ msgstr "Nabądź produkty"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Właściwości"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Planowana data"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Dodatkowe informacje"
 
@@ -1301,8 +1267,7 @@ msgid "Change Product Qty."
 msgstr "Zmień ilość produktu"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Wykonano"
 
@@ -1350,18 +1315,15 @@ msgid "Capacity per Cycle"
 msgstr "Ilość na cykl"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Suma godzin"
 
@@ -1376,8 +1338,7 @@ msgid "Product BoM Structure"
 msgstr "Struktura Zest. Mat. produktu"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1403,16 +1364,14 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr "Typ produktu jest Rejestrowany i metoda nabycia jest Na zapas."
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Ważność tego Zestawienia materiałowego lub komponentu. Pozostaw puste, jeśli "
 "ma być zawsze ważny."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "JS produktu"
 
@@ -1424,14 +1383,12 @@ msgstr "JM produktu"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centrum robocze"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Bardzo pilne"
 
@@ -1471,8 +1428,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Zaplanowane produkty"
 
@@ -1499,8 +1455,7 @@ msgstr "Jeśli w zamówieniu nabycia produkt jest typu Rejestrowany."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Centra robocze"
 
@@ -1648,8 +1603,7 @@ msgstr "Wykorzystanie centrów roboczych"
 msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
-msgstr ""
-"Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
+msgstr "Efektywność produkcji. Współczynnik 0,9 oznacza stratę 10% produkcji."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1739,8 +1693,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Zest. Mat."
 
@@ -1784,8 +1737,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Wersje Zest. Mat."
 
@@ -1795,14 +1747,12 @@ msgid "Retry"
 msgstr "Powtórz"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Projekt"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normalne"
 
@@ -1856,11 +1806,8 @@ msgid "from stock"
 msgstr "z zapasu"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informacje ogólne"
 
@@ -1913,14 +1860,10 @@ msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Opis"
@@ -1980,8 +1923,7 @@ msgid "On Stock"
 msgstr "Na zapas"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1992,3 +1934,51 @@ msgstr "Numeracja"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Komponenty zestawienia materiałowego"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Tydzień"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Raportowanie"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Obciążenie centrów roboczych"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Obciążenie centrum roboczego"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Zarządzanie MRP - Raportowanie"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Wycena zapasów"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Obciążenia centrum roboczego"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Tygodniowe odchylenie wartości zapasów"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Odchylenie wartości zapasów"
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 7b9d6b47425..d78c37f9797 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Origem"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -172,8 +170,7 @@ msgstr "Aprovisionamentos automáticos"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Quantidade do produto"
@@ -260,8 +257,7 @@ msgid "Internal Ref."
 msgstr "referencia interna"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Estado"
@@ -301,22 +297,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Ordens de produção"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Não urgente"
 
@@ -362,8 +355,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -470,8 +462,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "UdM do Produto"
 
@@ -591,10 +582,8 @@ msgid "Waiting"
 msgstr "Em espera"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Roteamento"
@@ -667,8 +656,7 @@ msgid "Production orders"
 msgstr "Ordens de produção"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -694,8 +682,7 @@ msgid "Security Days"
 msgstr "Dias de segurança"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -753,9 +740,7 @@ msgid "Production done"
 msgstr "Produção concluída"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Código"
@@ -767,8 +752,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Propriedade do grupo"
 
@@ -783,14 +767,12 @@ msgid "References"
 msgstr "Referência"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -872,14 +854,10 @@ msgid "Nbr of cycle"
 msgstr "Numero de ciclos"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nome"
 
@@ -989,8 +967,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "factura do material"
@@ -1051,8 +1028,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioridade"
@@ -1081,8 +1057,7 @@ msgstr "Ferramenta"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1117,8 +1092,7 @@ msgid "Max Quantity"
 msgstr "Quantidade máxima"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Aquisição"
 
@@ -1168,8 +1142,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1195,10 +1168,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Activo"
 
@@ -1211,23 +1182,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propriedades"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Data marcada"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Informação extra"
 
@@ -1275,8 +1241,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Concluído"
 
@@ -1323,18 +1288,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacidade por ciclo"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produto"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1349,8 +1311,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1374,14 +1335,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "UoS do producto"
 
@@ -1393,14 +1352,12 @@ msgstr "UdM do produto"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centro de trabalho"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Muito urgente"
 
@@ -1438,8 +1395,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Produtos agendados"
 
@@ -1465,8 +1421,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1697,8 +1652,7 @@ msgid "plus"
 msgstr "mais"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "BoM"
 
@@ -1738,8 +1692,7 @@ msgid "last indice"
 msgstr "Último índice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Revisões de BoM"
 
@@ -1749,14 +1702,12 @@ msgid "Retry"
 msgstr "Tentar novamente"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1810,11 +1761,8 @@ msgid "from stock"
 msgstr "de stock"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informação geral"
 
@@ -1867,14 +1815,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Descrição"
@@ -1932,8 +1876,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1944,3 +1887,51 @@ msgstr "Sequência"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Factura dos componentes materiais"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Semana"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Relatório"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Carregar centro de trabalho"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Carregar centro de trabalho"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Valor de stock"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Carregamento do centro de trabalho"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Variação semanal do valor de stock"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Variação de valores de stock"
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index c1373584dbf..ac5ffe30100 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Origem"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -170,8 +168,7 @@ msgstr "Suprimento Automático"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr "Referência interna"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Status"
@@ -300,22 +296,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Pedidos de Produção"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Não urgente"
 
@@ -361,8 +354,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -471,8 +463,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -558,8 +549,7 @@ msgstr "Planejamento dos pedidos de Produção"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr ""
-"Fator que multiplica todos os momentos expressa no centro de trabalho."
+msgstr "Fator que multiplica todos os momentos expressa no centro de trabalho."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
@@ -596,10 +586,8 @@ msgid "Waiting"
 msgstr "Aguardando"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Roteamento"
@@ -672,8 +660,7 @@ msgid "Production orders"
 msgstr "Pedido de Produção"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "Hierarquia da lista de materiais"
 
@@ -700,8 +687,7 @@ msgid "Security Days"
 msgstr "Dias de Segurança"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Total de Ciclos"
 
@@ -761,9 +747,7 @@ msgid "Production done"
 msgstr "Produção feita"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Código"
@@ -775,8 +759,7 @@ msgstr "Nr.de Horas"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Propriedade Grupo"
 
@@ -791,14 +774,12 @@ msgid "References"
 msgstr "Referências"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -882,14 +863,10 @@ msgid "Nbr of cycle"
 msgstr "Nro de ciclo"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Nome"
 
@@ -1002,8 +979,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Lista de Materiais"
@@ -1064,8 +1040,7 @@ msgid "Sale Ref"
 msgstr "Ref Venda"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioridade"
@@ -1094,8 +1069,7 @@ msgstr "Ferramenta"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 "O local onde o sistema irá procurar produtos utilizados nas matérias-primas."
 
@@ -1118,8 +1092,7 @@ msgstr "Fazer Stock"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid "If product type is service and procure method is Make to order"
-msgstr ""
-"Se o tipo de produto é serviço e o método de aquisição é Make to order"
+msgstr "Se o tipo de produto é serviço e o método de aquisição é Make to order"
 
 #. module: mrp
 #: field:res.company,schedule_range:0
@@ -1132,8 +1105,7 @@ msgid "Max Quantity"
 msgstr "Quantidade Máx."
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Aquisição"
 
@@ -1183,8 +1155,7 @@ msgid "Procurement for raw materials."
 msgstr "Aquisição de matérias-primas."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Nota"
@@ -1210,10 +1181,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "Define um roteamento para descrever as etapas de Manufatura."
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Ativo"
 
@@ -1226,23 +1195,18 @@ msgstr "Adquirir Proodutos"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Propriedades"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Data prevista"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Informação Extra"
 
@@ -1291,8 +1255,7 @@ msgid "Change Product Qty."
 msgstr "Alterar produtos Qtd."
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Feito"
 
@@ -1340,18 +1303,15 @@ msgid "Capacity per Cycle"
 msgstr "Capacity per Cycle"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produto"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Total de Horas"
 
@@ -1366,8 +1326,7 @@ msgid "Product BoM Structure"
 msgstr "Produto BoM estrutura"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1394,16 +1353,14 @@ msgstr ""
 "Tipo de Produto é  Estocavel e método de aquisição é Fazer para estoque."
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 "Validade desta LdM (BoM) ou componente. Mantenha vazio se ele sempre for "
 "válido."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1415,14 +1372,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Centro de Trabalho"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Muito Urgente"
 
@@ -1462,8 +1417,7 @@ msgid "Stockable Order Request"
 msgstr "Requisição de Pedido de Estocagem"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Produtos Agendados"
 
@@ -1491,8 +1445,7 @@ msgstr "Se Tipo de Produto é  Estocavel na ordem de aquisição"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Ordens de Trabalho"
 
@@ -1731,8 +1684,7 @@ msgid "plus"
 msgstr "mais"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Lista de Material (BoM)"
 
@@ -1772,8 +1724,7 @@ msgid "last indice"
 msgstr "Último Indice"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "BoM Revisões"
 
@@ -1783,14 +1734,12 @@ msgid "Retry"
 msgstr "Repetir"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Provisório"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1813,8 +1762,7 @@ msgstr "Motivo da Aquisição"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
-msgstr ""
-"Qualquer lançamento sendo feito da lista de materiais para roteamento"
+msgstr "Qualquer lançamento sendo feito da lista de materiais para roteamento"
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
@@ -1845,11 +1793,8 @@ msgid "from stock"
 msgstr "De Estoque"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Informação Básica"
 
@@ -1902,14 +1847,10 @@ msgid "Change Product Qty"
 msgstr "Alterar Qtd. Produto"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Descrição"
@@ -1968,8 +1909,7 @@ msgid "On Stock"
 msgstr "Em Estoque"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1980,3 +1920,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Componentes da Lista de Materiais"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Relatórios"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 31282f1737d..968a4ef864c 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index c5355205462..080e2953698 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr "Склад для складирования"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Происхождение"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Настройки"
 
@@ -172,8 +170,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Кол-во продукции"
@@ -259,8 +256,7 @@ msgid "Internal Ref."
 msgstr "Внутренняя ссылка"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Статус"
@@ -300,22 +296,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Заказы на производство"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Количество"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Не срочно"
 
@@ -361,8 +354,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Срочно"
 
@@ -469,8 +461,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -590,10 +581,8 @@ msgid "Waiting"
 msgstr "В ожидании"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -666,8 +655,7 @@ msgid "Production orders"
 msgstr "Заказы на производство"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -693,8 +681,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -752,9 +739,7 @@ msgid "Production done"
 msgstr "Производство завершено"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Код"
@@ -766,8 +751,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Группа свойств"
 
@@ -782,14 +766,12 @@ msgid "References"
 msgstr "Ссылки"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -871,14 +853,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Название"
 
@@ -988,8 +966,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Спецификация"
@@ -1050,8 +1027,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Приоритет"
@@ -1080,8 +1056,7 @@ msgstr "Инструмент"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1116,8 +1091,7 @@ msgid "Max Quantity"
 msgstr "Макс. кол-во"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Снабжение"
 
@@ -1167,8 +1141,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1194,10 +1167,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Активен"
 
@@ -1210,23 +1181,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Свойства"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Запланированная дата"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Доп. информация"
 
@@ -1274,8 +1240,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Выполнено"
 
@@ -1323,18 +1288,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Продукция"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1349,8 +1311,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1374,14 +1335,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1391,16 +1350,12 @@ msgid "Product UoM"
 msgstr "Ед. изм. продукции"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Рабочая область"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Весьма срочно"
 
@@ -1438,8 +1393,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Запланированная продукция"
 
@@ -1465,8 +1419,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1697,8 +1650,7 @@ msgid "plus"
 msgstr "плюс"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "Спецификация"
 
@@ -1738,8 +1690,7 @@ msgid "last indice"
 msgstr "последний индекс"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1749,14 +1700,12 @@ msgid "Retry"
 msgstr "Повторить"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Черновик"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Нормально"
 
@@ -1810,11 +1759,8 @@ msgid "from stock"
 msgstr "из запасов"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Общая информация"
 
@@ -1867,14 +1813,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Описание"
@@ -1932,8 +1874,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1944,3 +1885,51 @@ msgstr "Последовательность"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Компоненты спецификации"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Неделя"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Отчетность"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Загрузка рабочей области"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Загрузка рабочей области"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "Управление MRP - Отчёт"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Оценка запасов"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Загрузка рабочих областей"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Недельное изменения оценки запасов"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Изменения оценки запасов"
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 0710ef82f0e..b8a83bc8e1b 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Izvor"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracija"
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr "Notranji sklic"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Stanje"
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Nujno"
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr "Čakanje"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Usmerjanje"
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Oznaka"
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr "Sklici"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Ime"
 
@@ -976,9 +954,9 @@ msgid "Procurement Purchase"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Št. ur"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioriteta"
@@ -1078,8 +1054,7 @@ msgstr "Orodje"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Nabava"
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Opomba"
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktivno"
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Karakteristike"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Planiran datum"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Dodatne informacije"
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Zaključeno"
 
@@ -1320,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1346,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1371,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1390,14 +1349,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1435,8 +1392,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1462,8 +1418,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1694,8 +1649,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1735,8 +1689,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1746,14 +1699,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Navadno"
 
@@ -1807,11 +1758,8 @@ msgid "from stock"
 msgstr "iz zaloge"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Splošne informacije"
 
@@ -1864,14 +1812,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Opis"
@@ -1929,8 +1873,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1941,3 +1884,51 @@ msgstr "Zaporedje"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Teden"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Poročanje"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Vrednost zaloge"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 3e627c3cb26..87308752cf7 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Ursprung"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Produktkvantitet"
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Status"
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Kvantitet"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Inte bråttom"
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Bråttom"
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr "Väntar"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kod"
@@ -764,8 +749,7 @@ msgstr "Antal timmar"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr "Referenser"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Namn"
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Prioritet"
@@ -1078,8 +1054,7 @@ msgstr "Verktyg"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Inköp"
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktiv"
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Egenskaper"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Extra information"
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr "Ändra produktkvantitet"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Klar"
 
@@ -1320,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Summa timmar"
 
@@ -1346,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1371,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1390,14 +1349,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Mycket bråttom"
 
@@ -1435,8 +1392,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1462,8 +1418,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1694,8 +1649,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1735,8 +1689,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1746,14 +1699,12 @@ msgid "Retry"
 msgstr "Försök igen"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Utdrag"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1807,11 +1758,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Allmän information"
 
@@ -1864,14 +1812,10 @@ msgid "Change Product Qty"
 msgstr "Ändra produktkvantitet"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Beskrivning"
@@ -1929,8 +1873,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1941,3 +1884,51 @@ msgstr "Sekvens"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index 3e0799692b8..0b6adab003b 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr ""
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr ""
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr ""
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr ""
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr ""
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1054,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1348,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1688,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1698,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1757,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1811,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1872,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1883,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 12e163a7b8e..e09eb428d91 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Menşei"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Ayarlar"
 
@@ -170,8 +168,7 @@ msgstr "Otomatik Satınalmalar"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Ürün Mik."
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr "Dahili Ref."
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "Durum"
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Üretim Emirleri"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Miktar"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Acil Değil"
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr "Planlanan Tarih"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Acil"
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr "Stoklanabilir Ürün Stoğ"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "Stok 2.Birim"
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr "Bekliyor"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Rota"
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr "Üretim Emirleri"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr "Emniyet Günü"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "Toplam Çevrim"
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr "Üretim Tamamlandı"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kodu"
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Özellik Grubu"
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr "Referanslar"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr "Çevrim Sayısı"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Adı"
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Ürün Ağacı"
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr "Satış Ref."
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Öncelik"
@@ -1078,8 +1054,7 @@ msgstr "Araç"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr "Max Miktar"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Satınalma"
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr "Hammaddeler için Satınalma"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "Not"
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktif"
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Özellikler"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Planlanan Tarih"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "Extra Bilgi"
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr "Ürün Miktarını Değiştir"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Bitti"
 
@@ -1319,18 +1284,15 @@ msgid "Capacity per Cycle"
 msgstr "Bant Kapasitesi"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Ürün"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "Toplam Saat"
 
@@ -1345,8 +1307,7 @@ msgid "Product BoM Structure"
 msgstr "Ürün BOM Yapısı"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1331,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "Stok 2.Birim"
 
@@ -1389,14 +1348,12 @@ msgstr "Birim"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "İş Merkezi"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Çok Acil"
 
@@ -1434,8 +1391,7 @@ msgid "Stockable Order Request"
 msgstr "Stoklanabilir Sipairş Talebi"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "Planlanan Ürünler"
 
@@ -1461,8 +1417,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "İş Emirleri"
 
@@ -1693,8 +1648,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1737,8 +1691,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "BoM Revizyonları"
 
@@ -1748,14 +1701,12 @@ msgid "Retry"
 msgstr "Tekrar Dene"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Taslak"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Normal"
 
@@ -1809,11 +1760,8 @@ msgid "from stock"
 msgstr "Stoktan"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Genel Bilgiler"
 
@@ -1866,14 +1814,10 @@ msgid "Change Product Qty"
 msgstr "Ürün Miktarını Değiştir"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Açıklama"
@@ -1931,8 +1875,7 @@ msgid "On Stock"
 msgstr "Stokta"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1943,3 +1886,51 @@ msgstr "Sıra No"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "Ürün Ağacı Bileşenleri"
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Hafta"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Raporlama"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "İş Merkezi Yükü"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "İş Merkezi Yükü"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "MRP Yönetimi - Raporlama"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Stok Değeri"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "İş Merkezi Yükü"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Haftalık Stok Değer Farkları"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Stok Değer Farkı"
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 1aff3b240f5..a2d19836faf 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -88,14 +88,12 @@ msgid "Stockable Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "Походження"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "Налаштування"
 
@@ -170,8 +168,7 @@ msgstr ""
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "К-сть"
@@ -257,8 +254,7 @@ msgid "Internal Ref."
 msgstr "Внутрішнє посилання"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr ""
@@ -298,22 +294,19 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "Заявки на виробництво"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "Кількість"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "Нетерміновий"
 
@@ -359,8 +352,7 @@ msgid "Scheduled Date"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "Терміновий"
 
@@ -467,8 +459,7 @@ msgid "Stockable Product Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr ""
 
@@ -588,10 +579,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "Технологічний маршрут"
@@ -664,8 +653,7 @@ msgid "Production orders"
 msgstr "Виробничі замовлення"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr ""
 
@@ -691,8 +679,7 @@ msgid "Security Days"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr ""
 
@@ -750,9 +737,7 @@ msgid "Production done"
 msgstr "Виробництво виконано"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Код"
@@ -764,8 +749,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "Група властивостей"
 
@@ -780,14 +764,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +851,10 @@ msgid "Nbr of cycle"
 msgstr "Кількість циклів"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Назва"
 
@@ -986,8 +964,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "Склад виробу"
@@ -1048,8 +1025,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "Пріоритет"
@@ -1078,8 +1054,7 @@ msgstr "Інструмент"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1089,7 @@ msgid "Max Quantity"
 msgstr "Макс. кількість"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "Постачання"
 
@@ -1165,8 +1139,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1165,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Активний"
 
@@ -1208,23 +1179,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "Властивості"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Запланована дата"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1238,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "Виконаний"
 
@@ -1320,18 +1285,15 @@ msgid "Capacity per Cycle"
 msgstr "Обсяг на цикл"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1346,8 +1308,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1371,14 +1332,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1390,14 +1349,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "Робочий центр"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "Дуже терміновий"
 
@@ -1435,8 +1392,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1462,8 +1418,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1694,8 +1649,7 @@ msgid "plus"
 msgstr "plus"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "СВ"
 
@@ -1735,8 +1689,7 @@ msgid "last indice"
 msgstr "останній індекс"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "Ревізії СВ"
 
@@ -1746,14 +1699,12 @@ msgid "Retry"
 msgstr "Повторити"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "Чорновик"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "Нормальний"
 
@@ -1807,11 +1758,8 @@ msgid "from stock"
 msgstr "зі складу"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "Загальне"
 
@@ -1864,14 +1812,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "Опис"
@@ -1929,8 +1873,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1942,5 +1885,53 @@ msgstr "Порядок"
 msgid "Bill of Materials Components"
 msgstr ""
 
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Тиждень"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Звіти"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "Завантаження робочого центру"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "Завантаження робочого центру"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Складська ціна"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "Навантаження робочих центрів"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "Щотижнева зміна вартості запасів"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Зміна складської ціни"
+
 #~ msgid "Production workcenters used"
 #~ msgstr "Задіяні робочі центри виробництва"
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 98db38dddd9..35247869c94 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -32,7 +32,9 @@ msgid ""
 "Triggers an automatic procurement for all products that have a virtual stock "
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
-msgstr "对所有虚拟库存为小于0产品自动备货.你或许不应该使用这个选项.建议你使用产品按单生产(MTO)的设置"
+msgstr ""
+"对所有虚拟库存为小于0产品自动备货.你或许不应该使用这个选项.建议你使用产品按单"
+"生产(MTO)的设置"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -88,14 +90,12 @@ msgid "Stockable Stock"
 msgstr "可库存库存"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr "来源"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr "设置"
 
@@ -170,8 +170,7 @@ msgstr "自动生成需求单"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "产品数量"
@@ -257,8 +256,7 @@ msgid "Internal Ref."
 msgstr "内部参考"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "状态"
@@ -298,22 +296,19 @@ msgstr "可库存按库存生产"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "生产单"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr "数量"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "不紧急"
 
@@ -359,8 +354,7 @@ msgid "Scheduled Date"
 msgstr "安排日期"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr "紧急"
 
@@ -467,8 +461,7 @@ msgid "Stockable Product Stock"
 msgstr "可库存产品库存"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "产品销售单位"
 
@@ -588,10 +581,8 @@ msgid "Waiting"
 msgstr "等待"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "工艺路线"
@@ -664,8 +655,7 @@ msgid "Production orders"
 msgstr "生产单"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "物料清单层次"
 
@@ -691,8 +681,7 @@ msgid "Security Days"
 msgstr "确保天数"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "总周期"
 
@@ -750,9 +739,7 @@ msgid "Production done"
 msgstr "生产完成"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "代码"
@@ -764,8 +751,7 @@ msgstr "小时编号"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "属性组"
 
@@ -780,14 +766,12 @@ msgid "References"
 msgstr "参考"
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +853,10 @@ msgid "Nbr of cycle"
 msgstr "周期数"
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "名称"
 
@@ -986,8 +966,7 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr "物料清单"
@@ -1048,8 +1027,7 @@ msgid "Sale Ref"
 msgstr "销售参考"
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr "优先级"
@@ -1078,8 +1056,7 @@ msgstr "工具"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr "系统查找产品使用的原料的存放库位"
 
 #. module: mrp
@@ -1114,8 +1091,7 @@ msgid "Max Quantity"
 msgstr "最大数量"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr "需求单"
 
@@ -1165,8 +1141,7 @@ msgid "Procurement for raw materials."
 msgstr "原材料需求"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr "备注"
@@ -1192,10 +1167,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr "定义一个工艺路线来描述生产的步骤"
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "生效"
 
@@ -1208,23 +1181,18 @@ msgstr "生产产品"
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr "属性"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "安排日期"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr "额外信息"
 
@@ -1272,8 +1240,7 @@ msgid "Change Product Qty."
 msgstr "改变产品数量"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr "完成"
 
@@ -1319,18 +1286,15 @@ msgid "Capacity per Cycle"
 msgstr "每循环生产能力"
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "产品"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr "总小时数"
 
@@ -1345,8 +1309,7 @@ msgid "Product BoM Structure"
 msgstr "物料清单结构"
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1333,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr "产品类型是可库存并且获得方式是来自订单"
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr "物料清单或组件有效.留空为总是有效"
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "产品销售单位"
 
@@ -1389,14 +1350,12 @@ msgstr "产品计量单位"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr "工作中心"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr "非常紧急"
 
@@ -1434,8 +1393,7 @@ msgid "Stockable Order Request"
 msgstr "可库存订单请求"
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr "安排的产品"
 
@@ -1461,8 +1419,7 @@ msgstr "如果在产品需求单的产品类型是可库存的"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr "工作单"
 
@@ -1497,8 +1454,9 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
-"在生产单并且不是每层上计算自动计算原料明细中使用的虚拟物料清单.如果你产品清单的顶层为“虚项/套件”它被认为是一套或者一包:这产品被组件所取代可以绕过生产"
-"单而通过销售单来领料/提货.普通物料清单将按每个产品清单层生成一个生产单."
+"在生产单并且不是每层上计算自动计算原料明细中使用的虚拟物料清单.如果你产品清单"
+"的顶层为“虚项/套件”它被认为是一套或者一包:这产品被组件所取代可以绕过生产单而"
+"通过销售单来领料/提货.普通物料清单将按每个产品清单层生成一个生产单."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1695,8 +1653,7 @@ msgid "plus"
 msgstr "正"
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr "物料清单"
 
@@ -1707,7 +1664,9 @@ msgid ""
 "product. The routing is mainly used to compute workcenter costs during "
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
-msgstr "这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心的成本和计划未来的工作中心的未来负荷"
+msgstr ""
+"这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心"
+"的成本和计划未来的工作中心的未来负荷"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1736,8 +1695,7 @@ msgid "last indice"
 msgstr "最近指标"
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr "物料清单版本"
 
@@ -1747,14 +1705,12 @@ msgid "Retry"
 msgstr "重试"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr "草稿"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr "一般"
 
@@ -1808,11 +1764,8 @@ msgid "from stock"
 msgstr "按库存生产"
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr "一般信息"
 
@@ -1865,14 +1818,10 @@ msgid "Change Product Qty"
 msgstr "改变产品数量"
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr "说明"
@@ -1930,8 +1879,7 @@ msgid "On Stock"
 msgstr "按库存"
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1943,6 +1891,54 @@ msgstr "序列"
 msgid "Bill of Materials Components"
 msgstr "物料清单组成"
 
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "周"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "内部报表"
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr "工作中心负荷"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr "工作中心负荷"
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr "MRP管理 - 报表"
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "库存值"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr "工作中心负荷"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr "每周库存值变动"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "库存值变化"
+
 #~ msgid ""
 #~ "\n"
 #~ "    This is the base module to manage the manufacturing process in Open "
@@ -1961,10 +1957,12 @@ msgstr "物料清单组成"
 #~ "    * Very flexible\n"
 #~ "    * Allows to browse Bill of Materials in complete structure\n"
 #~ "        that include child and phantom BoMs\n"
-#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    It supports complete integration and planification of stockable "
+#~ "goods,\n"
 #~ "    consumable of services. Services are completely integrated with the "
 #~ "rest\n"
-#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    of the software. For instance, you can set up a sub-contracting "
+#~ "service\n"
 #~ "    in a BoM to automatically purchase on order the assembly of your "
 #~ "production.\n"
 #~ "\n"
@@ -1991,7 +1989,8 @@ msgstr "物料清单组成"
 #~ "    *非常灵活\n"
 #~ "    *允许浏览产品清单的完整的结构包括子物料清单和虚项\n"
 #~ "    \n"
-#~ "    它支持完整的整和的和规划的可库存货物,可订购服务.服务是完全集成在软件上.比如,你能设定一个子合同服务,\n"
+#~ "    它支持完整的整和的和规划的可库存货物,可订购服务.服务是完全集成在软件"
+#~ "上.比如,你能设定一个子合同服务,\n"
 #~ "    在物料清单上自动采购你生产的订单组合\n"
 #~ "\t\n"
 #~ "    这模块提供的报表:\n"
@@ -2000,3 +1999,8 @@ msgstr "物料清单组成"
 #~ "    *打印生产单\n"
 #~ "    *库存预测\n"
 #~ "    "
+
+#~ msgid ""
+#~ "A module that adds new reports based on MRP cases.\n"
+#~ "    Workcenter loads, Weekly Stock value variation"
+#~ msgstr "这模块增加新的报表基于MRP业务个案,工作中心负荷,每周的库存变化"
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 7df262c67b2..93f4a8374f8 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* mrp
+# 	* mrp
 #
 msgid ""
 msgstr ""
@@ -32,7 +32,9 @@ msgid ""
 "Triggers an automatic procurement for all products that have a virtual stock "
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
-msgstr "為所有虛擬庫存為小於0的產品生成產品請求。您大可不用這個選項，建議您使用貨品訂貨型生產的設置。"
+msgstr ""
+"為所有虛擬庫存為小於0的產品生成產品請求。您大可不用這個選項，建議您使用貨品訂"
+"貨型生產的設置。"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -88,14 +90,12 @@ msgid "Stockable Stock"
 msgstr "可庫存項目"
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
+#: field:mrp.procurement,origin:0 field:mrp.production,origin:0
 msgid "Origin"
 msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration view:res.company:0
 msgid "Configuration"
 msgstr ""
 
@@ -156,7 +156,9 @@ msgstr "物料需求計劃 & 物流調度"
 msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
-msgstr "此工作中心可同時運行的數量。如果一個工作中心代表一個擁有5名工人的隊伍，則循環能力為5。"
+msgstr ""
+"此工作中心可同時運行的數量。如果一個工作中心代表一個擁有5名工人的隊伍，則循環"
+"能力為5。"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
@@ -170,8 +172,7 @@ msgstr "自動採購"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
+#: field:mrp.bom,product_qty:0 field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "貨品數量"
@@ -257,8 +258,7 @@ msgid "Internal Ref."
 msgstr "內部參照"
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
+#: view:mrp.procurement:0 field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
 msgstr "狀態"
@@ -298,22 +298,19 @@ msgstr "可庫存備貨型生產"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action view:mrp.production:0
 msgid "Production Orders"
 msgstr "生產單"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
+#: rml:bom.structure:0 field:mrp.procurement,product_qty:0
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Not urgent"
 msgstr "不緊急"
 
@@ -359,8 +356,7 @@ msgid "Scheduled Date"
 msgstr "預定日期"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Urgent"
 msgstr ""
 
@@ -381,7 +377,9 @@ msgid ""
 "Keep empty if you produce at the location where the finished products are "
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
-msgstr "如果您在所需成品地點生產，請留空。如在固定地點生產請設置地點。如果您外判這個生產業務，這也可以是業務夥伴的地點。"
+msgstr ""
+"如果您在所需成品地點生產，請留空。如在固定地點生產請設置地點。如果您外判這個"
+"生產業務，這也可以是業務夥伴的地點。"
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
@@ -467,8 +465,7 @@ msgid "Stockable Product Stock"
 msgstr "可庫存貨品庫存"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
+#: field:mrp.bom,product_uos:0 field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
 msgstr "貨品銷售計量單位"
 
@@ -588,10 +585,8 @@ msgid "Waiting"
 msgstr "等待中"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
+#: model:ir.model,name:mrp.model_mrp_routing field:mrp.bom,routing_id:0
+#: field:mrp.production,routing_id:0 view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
 msgstr "工藝流程"
@@ -664,8 +659,7 @@ msgid "Production orders"
 msgstr "生產單"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
+#: field:mrp.bom,child_complete_ids:0 field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
 msgstr "物料清單架構"
 
@@ -691,8 +685,7 @@ msgid "Security Days"
 msgstr "保障天數"
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,cycle_total:0
+#: view:mrp.production:0 field:mrp.production,cycle_total:0
 msgid "Total Cycles"
 msgstr "週期總數"
 
@@ -721,7 +714,8 @@ msgstr ""
 msgid ""
 "This wizard will planify the procurement for this product. This procurement "
 "may generate task, production orders or purchase orders."
-msgstr "這嚮導將計劃本產品的採購計劃。這採購計劃可能會產生任務，生產單或採購單。"
+msgstr ""
+"這嚮導將計劃本產品的採購計劃。這採購計劃可能會產生任務，生產單或採購單。"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
@@ -750,9 +744,7 @@ msgid "Production done"
 msgstr "生產完成"
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
-#: field:mrp.routing,code:0
+#: rml:bom.structure:0 field:mrp.bom,code:0 field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "代碼"
@@ -764,8 +756,7 @@ msgstr "小時數"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.property,group_id:0 field:mrp.property.group,name:0
 msgid "Property Group"
 msgstr "屬性組別"
 
@@ -780,14 +771,12 @@ msgid "References"
 msgstr ""
 
 #. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
+#: wizard_button:change_production_qty,confirm,end:0 view:mrp.procurement:0
 #: selection:mrp.procurement,state:0
 #: wizard_button:mrp.procurement.compute,init,end:0
 #: wizard_button:mrp.procurement.compute.all,init,end:0
 #: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
-#: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
+#: view:mrp.production:0 wizard_button:mrp.workcenter.load,init,end:0
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
@@ -869,14 +858,10 @@ msgid "Nbr of cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
-#: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
-#: field:mrp.routing,name:0
-#: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
+#: field:mrp.bom,name:0 field:mrp.procurement,name:0
+#: rml:mrp.production.order:0 field:mrp.production.product.line,name:0
+#: field:mrp.property,name:0 field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0 field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr ""
 
@@ -986,8 +971,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom
-#: view:mrp.bom:0
+#: model:ir.model,name:mrp.model_mrp_bom view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
 msgstr ""
@@ -1048,8 +1032,7 @@ msgid "Sale Ref"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,priority:0
-#: field:mrp.production,priority:0
+#: field:mrp.procurement,priority:0 field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
 msgstr ""
@@ -1078,8 +1061,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+msgid "Location where the system will look for products used in raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1114,8 +1096,7 @@ msgid "Max Quantity"
 msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_mrp_procurement view:mrp.procurement:0
 msgid "Procurement"
 msgstr ""
 
@@ -1165,8 +1146,7 @@ msgid "Procurement for raw materials."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
+#: view:mrp.procurement:0 field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
 msgstr ""
@@ -1192,10 +1172,8 @@ msgid "Define a routing to describe the manufacturing steps."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,active:0
-#: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
+#: field:mrp.bom,active:0 field:mrp.routing,active:0
+#: field:mrp.workcenter,active:0 field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr ""
 
@@ -1208,23 +1186,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
-#: view:mrp.bom:0
-#: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
-#: view:mrp.property:0
+#: view:mrp.bom:0 field:mrp.bom,property_ids:0 view:mrp.procurement:0
+#: field:mrp.procurement,property_ids:0 view:mrp.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
-#: field:mrp.production,date_planned:0
+#: field:mrp.procurement,date_planned:0 field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-#: view:mrp.production:0
+#: view:mrp.procurement:0 view:mrp.production:0
 msgid "Extra Information"
 msgstr ""
 
@@ -1272,8 +1245,7 @@ msgid "Change Product Qty."
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Done"
 msgstr ""
 
@@ -1319,18 +1291,15 @@ msgid "Capacity per Cycle"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
-#: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,product_id:0 field:mrp.procurement,product_id:0
+#: field:mrp.production,product_id:0 rml:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: field:mrp.production,hour_total:0
+#: view:mrp.production:0 field:mrp.production,hour_total:0
 msgid "Total Hours"
 msgstr ""
 
@@ -1345,8 +1314,7 @@ msgid "Product BoM Structure"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,product_uom:0
-#: field:mrp.production,product_uom:0
+#: field:mrp.bom,product_uom:0 field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
@@ -1370,14 +1338,12 @@ msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,date_start:0
-#: help:mrp.bom,date_stop:0
+#: help:mrp.bom,date_start:0 help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
-#: field:mrp.production,product_uos:0
+#: field:mrp.procurement,product_uos:0 field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr ""
 
@@ -1389,14 +1355,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
 #: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
+#: field:mrp.routing.workcenter,workcenter_id:0 view:mrp.workcenter:0
 msgid "Workcenter"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Very Urgent"
 msgstr ""
 
@@ -1434,8 +1398,7 @@ msgid "Stockable Order Request"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-#: view:mrp.production.product.line:0
+#: view:mrp.production:0 view:mrp.production.product.line:0
 msgid "Scheduled Products"
 msgstr ""
 
@@ -1461,8 +1424,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: view:mrp.production:0 rml:mrp.production.order:0
 msgid "Work Orders"
 msgstr ""
 
@@ -1693,8 +1655,7 @@ msgid "plus"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:mrp.bom.revision,bom_id:0 field:mrp.procurement,bom_id:0
 msgid "BoM"
 msgstr ""
 
@@ -1734,8 +1695,7 @@ msgid "last indice"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
+#: field:mrp.bom,revision_ids:0 view:mrp.bom.revision:0
 msgid "BoM Revisions"
 msgstr ""
 
@@ -1745,14 +1705,12 @@ msgid "Retry"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-#: selection:mrp.production,state:0
+#: selection:mrp.procurement,state:0 selection:mrp.production,state:0
 msgid "Draft"
 msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
+#: selection:mrp.procurement,priority:0 selection:mrp.production,priority:0
 msgid "Normal"
 msgstr ""
 
@@ -1806,11 +1764,8 @@ msgid "from stock"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
-#: view:mrp.routing.workcenter:0
+#: view:mrp.bom:0 view:mrp.property:0 view:mrp.property.group:0
+#: view:mrp.routing:0 view:mrp.routing.workcenter:0
 msgid "General Information"
 msgstr ""
 
@@ -1863,14 +1818,10 @@ msgid "Change Product Qty"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
-#: field:mrp.routing,note:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
+#: field:mrp.bom.revision,description:0 view:mrp.property:0
+#: field:mrp.property,description:0 field:mrp.property.group,description:0
+#: view:mrp.routing:0 field:mrp.routing,note:0
+#: field:mrp.routing.workcenter,note:0 view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
 msgstr ""
@@ -1928,8 +1879,7 @@ msgid "On Stock"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: field:mrp.bom,sequence:0 rml:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
@@ -1940,3 +1890,51 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 9f28cff4594..0cc564c7091 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 from mx import DateTime
-from osv import fields
-from osv import osv
+from datetime import datetime, timedelta
+from osv import osv, fields
 from tools.translate import _
 import ir
 import netsvc
@@ -100,8 +100,8 @@ class mrp_routing_workcenter(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
         'cycle_nbr': fields.float('Number of Cycles', required=True,
-            help="Time in hours for doing one cycle."),
-        'hour_nbr': fields.float('Number of Hours', required=True, help="Cost per hour"),
+            help="Number of operations this workcenter can do."),
+        'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for doing one cycle."),
         'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade',
              help="Routing indicates all the workcenters used, for how long and/or cycles." \
                 "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
@@ -373,8 +373,6 @@ def rounding(f, r):
 
 class many2many_domain(fields.many2many):
     def set(self, cr, obj, id, name, values, user=None, context=None):
-        if not values:
-            return
         return super(many2many_domain, self).set(cr, obj, id, name, values, user=user,
                 context=context)
 
@@ -393,8 +391,6 @@ class many2many_domain(fields.many2many):
 
 class one2many_domain(fields.one2many):
     def set(self, cr, obj, id, field, values, user=None, context=None):
-        if not values:
-            return
         return super(one2many_domain, self).set(cr, obj, id, field, values,
                                             user=user, context=context)
 
@@ -417,7 +413,6 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
-    _log_create = True
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -486,10 +481,10 @@ class mrp_production(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
-        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consumme', domain=[('state','not in', ('done', 'cancel'))]),
-        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consummed Products', domain=[('state','in', ('done', 'cancel'))]),
-        'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))]),
-        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
+        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consumme', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
+        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consummed Products', domain=[('state','in', ('done', 'cancel'))], readonly=True),
+        'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
+        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))], readonly=True),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
@@ -509,7 +504,18 @@ class mrp_production(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
     }
     _order = 'date_planned asc, priority desc';
-
+    
+    def _check_qty(self, cr, uid, ids):
+        orders = self.browse(cr, uid, ids)
+        for order in orders:
+            if order.product_qty <= 0:
+                return False
+        return True
+    
+    _constraints = [
+        (_check_qty, 'Order quantity cannot be negative or zero !', ['product_qty']),
+    ]
+    
     def unlink(self, cr, uid, ids, context=None):
         productions = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
@@ -520,14 +526,17 @@ class mrp_production(osv.osv):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Production Order(s) which are in %s State!' % s['state']))
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
-    def copy(self, cr, uid, id, default=None,context=None):
-        if not default:
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
             default = {}
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.production'),
             'move_lines' : [],
-            'move_created_ids': [],
-            'state': 'draft'
+            'move_lines2' : [],
+            'move_created_ids' : [],
+            'move_created_ids2' : [],
+            'product_lines' : [],
+            'picking_id': False
         })
         return super(mrp_production, self).copy(cr, uid, id, default, context)
 
@@ -636,15 +645,23 @@ class mrp_production(osv.osv):
         """ Changes the production state to Ready and location id of stock move.
         @return: True
         """
-        for (id,name) in self.name_get(cr, uid, ids):
-            message = _('Manufacturing Order ') + " '" + name + "' "+ _("is ready to produce.")
-            self.log(cr, uid, id, message)
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state': 'ready'})
-        for production in self.browse(cr, uid, ids):
+
+        for (production_id,name) in self.name_get(cr, uid, ids):
+            production = self.browse(cr, uid, production_id)
             if production.move_prod_id:
                 move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id': production.location_dest_id.id})
+
+            message = ("%s %s %s %s %s %s") % (
+                    _('Manufacturing Order '),
+                    name,
+                    _("scheduled the"),
+                    datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
+                    _("for"),
+                    production.product_id.name)
+            self.log(cr, uid, production_id, message)
         return True
 
     def action_production_end(self, cr, uid, ids):
@@ -678,9 +695,10 @@ class mrp_production(osv.osv):
         @param production_mode: specify production mode (consume/consume&produce).
         @return: True
         """
+       
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id)
-
+        
         raw_product_todo = []
         final_product_todo = []
 
@@ -690,6 +708,7 @@ class mrp_production(osv.osv):
                 continue
             produced_qty += produced_product.product_qty
 
+
         if production_mode in ['consume','consume_produce']:
             consumed_products = {}
             for consumed_product in production.move_lines2:
@@ -698,12 +717,13 @@ class mrp_production(osv.osv):
                 if not consumed_products.get(consumed_product.product_id.id, False):
                     consumed_products[consumed_product.product_id.id] = 0
                 consumed_products[consumed_product.product_id.id] -= consumed_product.product_qty
-
+                
             for raw_product in production.move_lines:
                 for f in production.product_lines:
                     if f.product_id.id==raw_product.product_id.id:
                         consumed_qty = consumed_products.get(raw_product.product_id.id, 0)
                         rest_qty = production_qty * f.product_qty / production.product_qty - consumed_qty
+                         
                         if rest_qty > 0:
                             stock_mov_obj.action_consume(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
 
@@ -852,7 +872,7 @@ class mrp_production(osv.osv):
                 'company_id': production.company_id.id,
             }
             res_final_id = move_obj.create(cr, uid, data)
-
+             
             self.write(cr, uid, [production.id], {'move_created_ids': [(6, 0, [res_final_id])]})
             moves = []
             for line in production.product_lines:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5eb86e77c49..ae5572b1d76 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -67,16 +67,38 @@
                     <field name="group_id" select="1"/>
                     <field name="composition" select="1"/>
                     <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
+     
+        <record id="view_mrp_property_search" model="ir.ui.view">
+            <field name="name">mrp.property.search</field>
+            <field name="model">mrp.property</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                       <field name="group_id"  widget="selection" />
+                       <field name="composition"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+           
+        
         <record id="mrp_property_action" model="ir.actions.act_window">
             <field name="name">Properties</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.property</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_mrp_property_search"/>
         </record>
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
@@ -105,6 +127,9 @@
                 <tree string="Work Center">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="resource_id"/>
+                    <field name="resource_type"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -148,12 +173,37 @@
                 </form>
             </field>
         </record>
+        
+        <!-- Search Views -->
+
+        <record id="view_mrp_workcenter_search" model="ir.ui.view">
+            <field name="name">mrp.workcenter.search</field>
+            <field name="model">mrp.workcenter</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search for mrp workcenter">
+                   <group col='15' colspan='4'>
+	                    <field name="code"/>
+	                    <field name="name"/>
+	                    <field name="resource_type"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
             <field name="name">Work Centers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.workcenter</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
+            <field name="search_view_id" ref="view_mrp_workcenter_search"/>
         </record>
 
         <!--
@@ -186,7 +236,8 @@
                     <field name="workcenter_id" select="1"/>
                     <field name="cycle_nbr"/>
                     <field name="hour_nbr"/>
-                    <field colspan="4" name="note"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="note" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -298,15 +349,22 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group col='4' colspan='4'>
-                      <field name="name"/>
-                        <field name="code" string="Reference"/>
-                        <field name="product_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                         <field name="name"/>
+                         <field name="code" string="Reference"/>
+                         <field name="product_id"/>
+                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        
                    </group>
                 </search>
             </field>
@@ -325,10 +383,11 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="method"/>
+                    <field name="type"/>
+                    <field name="method" groups="base.group_extended"/>
                     <field name="routing_id" groups="base.group_extended"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <field name="date_start" groups="base.group_extended"/>
+                    <field name="date_stop" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -405,7 +464,8 @@
                     <field colspan="1" name="indice"/>
                     <field colspan="1" name="date"/>
                     <field name="author_id" readonly="1"/>
-                    <field colspan="4" name="description"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -574,7 +634,7 @@
                                 <field name="state"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
+                                <button name="button_produce" states="ready" string="Start Production" icon="gtk-execute"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
@@ -589,11 +649,7 @@
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <field name="state" invisible="1"/>                                    
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 64185d8dc26..8954d234510 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -24,17 +24,43 @@ from tools.translate import _
 
 
 class product_product(osv.osv):
-    _inherit = "product.product"
+    _inherit = "product.product"    
+
+    def get_product_accounts(self, cr, uid, product_id, context={}):
+        """ To get the stock input account, stock output account and stock journal related to product.
+        @param product_id: product id            
+        @return: dictionary which contains information regarding stock input account, stock output account and stock journal
+        """           
+        product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
+        
+        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
+        if not stock_input_acc:
+            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+        
+        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+        if not stock_output_acc:
+            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+
+        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
+        
+        res = {}
+        res.update({'stock_account_input': stock_input_acc})
+        res.update({'stock_account_output': stock_output_acc})
+        res.update({'stock_journal': journal_id})  
+        
+        return res
+    
+
     _columns = {
         "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
     }
+
     def do_change_standard_price(self, cr, uid, ids, datas, context={}):
         """ Changes the Standard Price of Product and parent products and creates an account move accordingly.
         @param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
         @param context: A standard dictionary
         @return:
         """
-        #TODO : TO Check
         res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
         bom_obj = self.pool.get('mrp.bom')
         def _compute_price(bom):
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index d46d18e30ef..e823bd036d8 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -24,11 +24,7 @@
 "access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
-"access_mrp_installer","mrp.installer","model_mrp_installer","base.group_system",1,1,1,1
-"access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,1,1,1
-"access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_product_price","mrp.product_price","model_mrp_product_price","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_workcenter_load","mrp.workcenter.load","model_mrp_workcenter_load","mrp.group_mrp_manager",1,0,0,0
+"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 67efd0d2753..ab22f169552 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -94,7 +94,6 @@ class StockMove(osv.osv):
                         'location_id': move.location_id.id,
                         'procure_method': prodobj.procure_method,
                         'move_id': mid,
-                        'company_id': line['company_id'],
                     })
                     wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
                 move_obj.write(cr, uid, [move.id], {
diff --git a/addons/mrp/test/mrp_packs.yml b/addons/mrp/test/mrp_packs.yml
new file mode 100644
index 00000000000..309e3d2b200
--- /dev/null
+++ b/addons/mrp/test/mrp_packs.yml
@@ -0,0 +1,94 @@
+-
+  In order to test the Packs in OpenERP, we will try to sell a "Pack of 24
+  beers" which is composed of 24 "Beers" and a "Beers Pack".
+- |
+  I start by creating the Beers product.
+- 
+  !record {model: product.product, id: product_product_beers0}:
+    categ_id: product.cat1
+    name: Beers
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I create the "Beers Pack" product.
+- 
+  !record {model: product.product, id: product_product_beerspack0}:
+    categ_id: product.cat1
+    name: Beers Pack
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I create the "Pack of 24 beers" product
+- 
+  !record {model: product.product, id: product_product_packofbeers0}:
+    categ_id: product.cat1
+    name: Pack of 24 Beers
+    procure_method: make_to_order
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+- |
+  I define the Phantom Bill of Material for the "Pack of 24 beers"
+- 
+  !record {model: mrp.bom, id: mrp_bom_packofbeers0}:
+    bom_lines:
+      - company_id: base.main_company
+        name: Beers
+        product_id: product_product_beers0
+        product_qty: 24.0
+        product_uom: product.product_uom_unit
+        type: normal
+      - company_id: base.main_company
+        name: Beers Pack
+        product_id: product_product_beerspack0
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        type: normal
+    name: Pack of 24 Beers
+    product_id: product_product_packofbeers0
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    type: phantom
+- |
+  As all my data are created, I will create an outgoing order picking for a
+  "Pack of 24 Beers"
+- 
+  !record {model: stock.picking, id: picking_out}:
+    address_id: base.res_partner_address_tang
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - company_id: base.main_company
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: Pack of 24 Beers
+        product_id: mrp_bom_packofbeers0
+        product_qty: 2.0
+        product_uom: product.product_uom_unit
+    move_type: direct
+    type: out
+- |
+  I validate the newly created picking.
+- 
+  !python {model: stock.picking}: |
+    self.draft_validate(cr, uid, [ref("picking_out")], {
+        "active_ids": [ref("stock.menu_action_picking_tree")],
+        "active_id": ref("stock.menu_action_picking_tree"), }
+    )
+- |
+  I check that my Picking of a "PAck of 24 beers" as been automatically
+  converted to a picking of 24 beers and a pack of beer, so that my
+  stock of beers remains exact.
+-
+  !assert {model: stock.picking, id: picking_out}:
+    - len(move_ids) == 2
+    - move_ids[0].product_id.id <> move_ids[1].product_id.id
+    - move_ids[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
+    - move_ids[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index fe64fae0069..703e5f1bb40 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -20,6 +20,9 @@
     type: product
     uom_id: product_uom_litre0
     uom_po_id: product_uom_litre0
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
 -
   I create record for product Orange.
 - 
@@ -35,6 +38,9 @@
     type: product
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
 -
   I create record for product Sugar.
 - 
@@ -50,6 +56,9 @@
     type: product
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
 -
   I create record for product Water.
 - 
@@ -61,6 +70,9 @@
     type: consu
     uom_id: product_uom_litre0
     uom_po_id: product_uom_litre0
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
 -
   I define the BoM to produce an orange juice.
 - 
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 1fe0f74fa6a..b86d49cca3a 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -221,8 +221,7 @@
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
-    partner_id: base.res_partner_maxtor
-    address_id: base.res_partner_address_wong
+
 -
   I make my picking done.
 -
@@ -231,8 +230,6 @@
      picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
      partial = self.browse(cr, uid, 1, context)
      partial_datas = {
-            'partner_id' : partial.partner_id and partial.partner_id.id or False,
-            'address_id' : partial.address_id and partial.address_id.id or False,
             'delivery_date' : partial.date         
      }
      for pick in pick_obj.browse(cr, uid, picking_ids):
@@ -260,8 +257,7 @@
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
-    partner_id: base.res_partner_maxtor
-    address_id: base.res_partner_address_wong
+
 -
   I make my picking done.
 -
@@ -270,8 +266,6 @@
      picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
      partial = self.browse(cr, uid, 1, context)
      partial_datas = {
-            'partner_id': partial.partner_id and partial.partner_id.id or False,
-            'address_id': partial.address_id and partial.address_id.id or False,
             'delivery_date': partial.date         
      }
      for pick in pick_obj.browse(cr, uid, picking_ids):
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 34520a71721..63d9dbcb451 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -13,8 +13,8 @@
 				    <field name="product_qty"/>
 				    <newline/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
+                		<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="change_prod_qty" string="Validate"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index e2e294c5739..524e1c73c2f 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -13,8 +13,8 @@
 				    <field name="number"/>
 				    <newline/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
+                		<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="print_report" string="Print"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
@@ -27,7 +27,7 @@
             src_model="product.product"
 		    view_mode="form"
 		    target="new"        
-            key2="client_action_multi"    
+            key2="client_print_multi"    
 		    id="action_view_mrp_product_price_wizard"/>
 	</data>
 </openerp>	
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 4688f3fb15b..2fe4edd265e 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -43,6 +43,7 @@ class mrp_product_produce(osv.osv_memory):
                                 context['active_id'], context=context)
         done = 0.0
         for move in prod.move_created_ids2:
+            if not move.scraped:
                 done += move.product_qty
         return (prod.product_qty - done) or prod.product_qty
     
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index f730c4a6b92..f2040049056 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -18,8 +18,8 @@
                 	<separator string="" colspan="4" />
                 	<label string="" colspan="2" />
                 	<group col="2" colspan="1">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
+                		<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="do_produce" string="Confirm"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index a6b7a4f987d..baae314d04c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -15,8 +15,8 @@
 				    <field name="measure_unit"/>
 				    <newline/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
+                		<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="print_report" string="Print"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
@@ -28,8 +28,8 @@
             res_model="mrp.workcenter.load"
             src_model="mrp.workcenter"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
+		    target="new"   
+            key2="client_print_multi"    
 		    id="action_mrp_workcenter_load_wizard"/>
 	</data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index bd3574d2608..fb4d728f4da 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -72,10 +72,10 @@
                     <group colspan="8" col="8">
                         <field name="state"/>
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                        <button name="button_start_working" string="Start" states="draft" icon="gtk-execute"/>
+                        <button name="button_start_working" string="Start" states="draft" icon="gtk-go-forward"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
                         <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-cancel"/>
-                        <button name="button_pause" string="Pause" states="startworking" icon="gtk-execute"/>
+                        <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                         <button name="button_done" string="Finished" states="startworking" icon="gtk-ok"/>
                     </group>
                 </page>
@@ -89,16 +89,33 @@
             <field name="model">mrp.production.workcenter.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Work Orders">
-                	<group col='6' colspan='4'>
-                		<field name="name"/>
-                		<field name="workcenter_id"/>
-                		<field name="production_id"/>
-                	</group>
+            <search string="Search Work Orders">
+                        <group col='9' colspan='4'>
+	                       <filter icon="terp-document-new" string="Draft"
+	                           domain="[('state','=','draft')]"/>
+	                       <filter icon="terp-check" string="In Progress" name="Current"
+	                           default="1"
+	                           domain="[('state','=','startworking')]"/>
+	                       <filter icon="terp-gtk-media-pause" string="Pending"
+	                           domain="[('state','=','pause')]"/>
+	                       <separator orientation="vertical"/>
+	                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+	                           domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+	                           help="Production started late" />
+	                       <separator orientation="vertical"/>
+	                		<field name="name"/>
+	                		<field name="workcenter_id" widget="selection"/>
+	                		<field name="production_id" />
+	                		<field name="state" />
+	                		<field name="date_planned" widget="date"/>
+	                	</group>
                 	<newline/>
                     <group expand="0" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product'}"/>
+                        <filter string="Workcenter" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'workcenter_id'}"/>
+                        <filter string="Production" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'production_id'}"/>                      
+                        <separator orientation="vertical"/>                   
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index fa01d7120fd..58efc27f824 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -45,6 +45,7 @@
         'mrp_repair_report.xml',
     ],
     'demo_xml': [],
+    'test': ['test/test_mrp_repair.yml'],
     'installable': True,
     'active': False,
     'certificate': '0060814381277',
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index d87e16adf40..a3eac181231 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -344,7 +344,7 @@ class mrp_repair(osv.osv):
                         'origin': invoice.origin+', '+repair.name,
                         'comment':(comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
                     }
-                    invoice_obj.write(cr, uid, [inv_id], invoice_vals, context=context)
+                    inv_obj.write(cr, uid, [inv_id], invoice_vals, context=context)
                 else:
                     if not repair.partner_id.property_account_receivable:
                         raise osv.except_osv(_('Error !'), _('No account defined for partner "%s".') % repair.partner_id.name )
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 4c655099386..4e59a7d6a15 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -100,8 +100,8 @@
                         <group col="13" colspan="4">
                             <field name="state"/>
                             <button name="repair_confirm" states="draft" string="Confirm Repair" icon="gtk-apply"/>
-                            <button name="repair_ready" states="confirmed" string="Start Repair" icon="gtk-execute"/>
-                            <button name="action_repair_start" states="ready" string="Start Repair" icon="gtk-execute"/>
+                            <button name="repair_ready" states="confirmed" string="Start Repair" icon="gtk-go-forward"/>
+                            <button name="action_repair_start" states="ready" string="Start Repair" icon="gtk-go-forward"/>
                             <button name="action_repair_end" states="under_repair" string="End Repair" icon="gtk-ok"/>
                             <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-convert"/>
                             <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
@@ -179,26 +179,30 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
               	<group col='4' colspan='4'>
-              		<field name="name" />
-                    <field name="product_id" />
+              	       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
+                       <filter icon="terp-check" string="Confirmed" domain="[('state','=', 'confirmed)]" name="current" />
+                       <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                       <separator orientation="vertical"/>
+                       <filter icon="terp-dolar" string="invoiced" domain="[('state','=','2binvoiced')]"/>
+                       <separator orientation="vertical"/>
+	              		<field name="name"/>
+	                    <field name="product_id"/>
+	                    <field name="partner_id"/>
+	                    <field name="state" />
               	</group>
               	<newline/>
                   <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                      <separator orientation="vertical"/>
                       <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}"/>
                   </group>
              </search>
           </field>
 	</record>
 
-        <record id="action_repair_order_form" model="ir.actions.act_window">
-            <field name="name">New Repair</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
+        
 
          <record id="action_repair_order_tree" model="ir.actions.act_window">
             <field name="name">Repair Orders</field>
@@ -207,49 +211,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_repair_order_form_filter"/>
-        </record>
+        </record>    
 
-         <record id="action_repair_quotation_tree" model="ir.actions.act_window">
-            <field name="name">Repairs in quotation</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_repair_progress_tree" model="ir.actions.act_window">
-            <field name="name">Repairs in progress</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','under_repair')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_repair_ready_tree" model="ir.actions.act_window">
-            <field name="name">Repairs Ready to Start</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
-            <field name="name">Repairs to be invoiced</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','2binvoiced')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" name="Repairs" sequence="50"/>
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" name="Repair Orders" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index c524afce69b..0f12f66a815 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -5,7 +5,3 @@
 "access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
 "access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,0,0,0
 "access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_cancel_user","mrp.repair.cancel user","model_mrp_repair_cancel","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_cancel_manager","mrp.repair.cancel manager","model_mrp_repair_cancel","stock.group_stock_manager",1,1,1,1
-"access_mrp_repair_make_invoice_user","mrp.repair.make_invoice user","model_mrp_repair_make_invoice","stock.group_stock_user",1,0,0,0
-"access_mrp_repair_make_invoice_manager","mrp.repair.make_invoice manager","model_mrp_repair_make_invoice","stock.group_stock_manager",1,1,1,1
diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
new file mode 100644
index 00000000000..a3fe8ef28f4
--- /dev/null
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -0,0 +1,99 @@
+- |
+  In order to test "mrp_repair" module, I start with creating repairt order, confirm it, and start repair.
+
+- |
+  Given that I have already  stock move line created.
+- 
+  !record {model: stock.move, id: stock_move_pcbasicpc0}:
+    company_id: base.main_company
+    date: '2010-06-24 20:10:28'
+    date_expected: '2010-06-24 20:10:55'
+    date_planned: '2010-06-24 20:10:28'
+    location_dest_id: stock.stock_location_stock
+    location_id: stock.stock_location_stock
+    name: '[PC1] Basic PC'
+    product_id: product.product_product_pc1
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 1.0
+ 
+- |
+  I start by creating new Repair order for "Basic Pc" product.
+- 
+  !record {model: mrp.repair, id: mrp_repair_rma0}:
+    address_id: base.res_partner_address_1
+    guarantee_limit: '2010-06-24'
+    invoice_method: 'after_repair'
+    partner_invoice_id: base.res_partner_address_1
+    location_dest_id: stock.stock_location_14
+    location_id: stock.stock_location_14
+    move_id: 'stock_move_pcbasicpc0'
+    name: RMA00004
+    operations:
+      - location_dest_id: stock.location_production
+        location_id: stock.stock_location_stock
+        name: '[HDD1] HDD Seagate 7200.8 80GB'
+        price_unit: 50.0
+        product_id: product.product_product_hdd1
+        product_uom: product.product_uom_unit
+        product_uom_qty: 1.0
+        state: draft
+        to_invoice: 1
+        type: add
+    partner_id: base.res_partner_9
+    product_id: product.product_product_pc1
+    
+- |
+  I check that Repair order is in "Draft" state.
+- 
+  !assert {model: mrp.repair, id: mrp_repair_rma0}:
+      - state == 'draft'
+
+- |
+  I confirm This Repair order.
+- 
+  !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma0}      
+
+- |
+  I start the repairing  process by   click on "Start Repair" Button.
+-
+  !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rma0}
+ 
+- |
+  I check that state is "Under Repair".
+-
+  !assert {model: mrp.repair, id: mrp_repair_rma0}:
+      - state == 'under_repair'
+- |
+  Repairing Process for product is Done and I End Repair process by click on "End Repair" button.
+-
+  !workflow {model: mrp.repair, action: action_repair_end, ref: mrp_repair_rma0}
+- |
+  I select invoiced after repair option in this "RMA00004" Repair order.
+  so I create Invoice by click on "Make Invoice" wizard.
+- 
+  !record {model: mrp.repair.make_invoice, id: mrp_repair_make_invoice_0}:
+    group: 1
+- |
+  I click on "Create Invoice" button of this wizard to make invoice.
+- 
+  !python {model: mrp.repair.make_invoice}: |
+    self.make_invoices(cr, uid, [ref("mrp_repair_make_invoice_0")], {"active_ids": [ref("mrp_repair.mrp_repair_rma0")]})
+- |
+  I check that Invoice is created for this repair order.
+-
+  !python {model: mrp.repair}: |
+     obj_lines = self.pool.get('account.invoice.line')
+     inv_obj = self.pool.get('account.invoice')
+     repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
+     invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_invoice_id.id)])
+     invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
+     
+     assert repair_id.partner_invoice_id == invoice_id.partner_id
+    
+     for operation in repair_id.operations:
+            if operation.to_invoice == True:
+                line_ids = obj_lines.search(cr, uid, [('product_id', '=', operation.product_id.id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', operation.price_unit)])
+                if line_ids:
+                    line_id = obj_lines.browse(cr, uid, line_ids)[0]
+                    assert line_id.product_id == operation.product_id  
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f914d198d06..25edbd454ec 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create invoices">
-				    <separator colspan="4" string="Do you really want to create the invoices ?" />  
-				    <field name="group"/>
-				    <newline/>  
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
+    		        <separator colspan="4" string="Do you really want to create the invoice(s) ?" />  
+			        <field name="group"/>
+                    <newline/>  
+                    <group col="2" colspan="4">                        
+                		<button icon='gtk-close' special="cancel"
+                			string="Close" />
                 		<button name="make_invoices" string="Create Invoice"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 81c947adfee..21e94b67eb1 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-07-02 12:11+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\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: 2010-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-07-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -27,22 +27,23 @@ msgstr ""
 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!"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
 
 #. module: multi_company
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Napaka pri obračunu DDV"
 
 #. module: multi_company
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -59,18 +60,18 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Privzeto podjetje"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Predmet"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
@@ -83,12 +84,12 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Glavna družba"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Pogoj"
 
 #. module: multi_company
 #: help:multi_company.default,company_dest_id:0
@@ -98,17 +99,17 @@ msgstr ""
 #. module: multi_company
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neveljaven XML za arhitekturo pogleda!"
 
 #. module: multi_company
 #: field:multi_company.default,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -118,7 +119,7 @@ msgstr ""
 #. module: multi_company
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Napaka. Ne morete ustvariti rekurzivnih družb."
 
 #. module: multi_company
 #: help:multi_company.default,name:0
@@ -128,7 +129,7 @@ msgstr ""
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi company"
-msgstr ""
+msgstr "Za več podjetij"
 
 #. module: multi_company
 #: model:ir.model,name:multi_company.model_multi_company_default
diff --git a/addons/olap/security/ir.model.access.csv b/addons/olap/security/ir.model.access.csv
index d400bf80bb0..b177ce4cb3b 100644
--- a/addons/olap/security/ir.model.access.csv
+++ b/addons/olap/security/ir.model.access.csv
@@ -1,9 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"olap_query_logs_clear","olap.query.logs.clear","model_olap_query_logs_clear","base.group_user",1,1,1,1
-"olap_query_logs_clear_msg","olap.query.logs.clear.msg","model_olap_query_logs_clear_msg","base.group_user",1,1,1,1
-"olap_load_column","olap.load.column","model_olap_load_column","base.group_user",1,1,1,1
 "olap_saved_query","olap.saved.query","model_olap_saved_query","base.group_user",1,1,1,1
-"olap_warehouse_wizard","olap.warehouse.wizard","model_olap_warehouse_wizard","base.group_user",1,1,1,1
-"olap_parameters_config_wizard","olap.parameters.config.wizard","model_olap_parameters_config_wizard","base.group_user",1,1,1,1
-"olap_bi_load_db_wizard","bi.load.db.wizard ","model_bi_load_db_wizard","base.group_user",1,1,1,1
-"olap_bi_auto_configure_wizard","bi.auto.configure.wizard","model_bi_auto_configure_wizard","base.group_user",1,1,1,1
diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py
index e0a0d49f603..97bca0b1073 100644
--- a/addons/partner_geo_assign/partner_geo_assign.py
+++ b/addons/partner_geo_assign/partner_geo_assign.py
@@ -23,18 +23,23 @@ from osv import osv
 from osv import fields
 import urllib,re
 import random, time
+from tools.translate import _
 
 def geo_find(addr):
-    import urllib,re
-    regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
-    url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
-    xml = urllib.urlopen(url).read()
-    if '<error>' in xml:
-        return None
-    result = re.search(regex, xml, re.M|re.I)
-    if not result:
-        return None
-    return float(result.group(1)),float(result.group(2))
+    try: 
+        regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
+        url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
+        xml = urllib.urlopen(url).read()
+        if '<error>' in xml:
+            return None
+        result = re.search(regex, xml, re.M|re.I)
+        if not result:
+            return None
+        return float(result.group(1)),float(result.group(2))
+    except Exception, e:
+        raise osv.except_osv(_('Network error'), 
+                             _('Could not contact geolocation servers, please make sure you have a working internet connection (%s)') % e)
+    
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
@@ -49,7 +54,6 @@ class res_partner(osv.osv):
         'partner_weight': lambda *args: 0
     }
     def geo_localize(self, cr, uid, ids, context=None):
-        regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
         for partner in self.browse(cr, uid, ids, context=context):
             if not partner.address:
                 continue
@@ -82,13 +86,17 @@ class crm_lead(osv.osv):
                 if lead.partner_assigned_id.address:
                     email = lead.partner_assigned_id.address[0].email
                 if not email:
-                    raise osv.except_osv(_('Error !'), _('No partner assigned to this opportunity'))
-                forward = fobj.create(cr, uid, {
-                    'name': 'email',
+                    raise osv.except_osv(_('Error !'), _('No email on the partner assigned to this opportunity'))
+
+                values = fobj.default_get(cr, uid, ['name', 'email_from'], context=context)
+                if not values.get('email_from'):
+                    raise osv.except_osv(_('Error !'), _('Please set an email address in your user preferences'))
+                values.update({
                     'history': 'whole',
                     'email_to': email,
-                    'message': fobj._get_case_history(cr, uid, 'whole', lead.id, context) or False
-                }, context)
+                    'message': fobj._get_case_history(cr, uid, 'whole', lead.id, context) or False,
+                    })
+                forward = fobj.create(cr, uid, values, context)
                 fobj.action_forward(cr, uid, [forward], context)
             else:
                 raise osv.except_osv(_('Error !'), _('No partner assigned to this opportunity'))
diff --git a/addons/partner_geo_assign/res_partner_view.xml b/addons/partner_geo_assign/res_partner_view.xml
index b8faedab0aa..26322f23495 100644
--- a/addons/partner_geo_assign/res_partner_view.xml
+++ b/addons/partner_geo_assign/res_partner_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
         <record id="view_crm_opportunity_geo_assign_form" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.inherit</field>
             <field name="model">crm.lead</field>
@@ -9,7 +8,7 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Partner Assignation">
+                    <page string="Geo Assignation">
                         <field name="partner_assigned_id"/>
                         <newline/>
                         <field name="partner_latitude"/>
@@ -36,7 +35,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Partner Association">
+                    <page string="Geo Location">
                         <field name="partner_weight"/>
                         <label string="" colspan="1"/>
                         <button
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index edf41f84934..ffe5d71c18e 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -238,6 +238,7 @@ class pos_order(osv.osv):
             'invoice_id': False,
             'account_move': False,
             'picking_id': False,
+            'statement_ids':[],
             'nb_print': 0,
             'pickings': []
         })
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 3fe5328c99e..9f07816b48d 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -47,8 +47,8 @@
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
-                                <button name="dummy_button" string="Compute" type="object" />
+                                <button name="%(action_pos_discount)d" string="D_iscount" icon="gtk-execute" type="action" states="draft"/>
+                                <button name="dummy_button" string="Compute" icon="gtk-execute" type="object" />
                             </group>
 
                             <group colspan="4" col="9" groups="base.group_extended">
@@ -95,8 +95,8 @@
                                 <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
                                 <field name="pricelist_id" domain="[('type','=','sale')]"/>
                                 <field name="invoice_id"/>
-                                <group colspan="2" col="3">
-                                    <button name="invoice" string="Create _Invoice" states="paid"/>
+                                <group colspan="2" col="4">
+                                    <button name="invoice" icon="gtk-execute" string="Create _Invoice" states="paid"/>
                                 </group>
                             </group>
 
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index ee905ed74bf..eb59548758c 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -35,19 +35,19 @@ class pos_invoice(report_sxw.rml_parse):
         })
         
 
-    def set_context(self, objects, data, ids, report_type=None):
-        super(pos_invoice, self).set_context(objects, data, ids, report_type)
+    def set_context(self, order, data, ids, report_type=None):
+        super(pos_invoice, self).set_context(order, data, ids, report_type)
         iids = []
         nids = []
 
-        for order in objects:
-            order.write({'nb_print': order.nb_print + 1})
 
-            if order.invoice_id and order.invoice_id not in iids:
-                if not order.invoice_id:
-                    raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
-                iids.append(order.invoice_id)
-                nids.append(order.invoice_id.id)
+        order.write({'nb_print': order.nb_print + 1})
+
+        if order.invoice_id and order.invoice_id not in iids:
+            if not order.invoice_id:
+                raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
+            iids.append(order.invoice_id)
+            nids.append(order.invoice_id.id)
         self.cr.commit()
         data['ids'] = nids
         self.datas = data
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index ee428ec2b19..e837bb42bbb 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -18,24 +18,4 @@
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_singer_statement","singer.statement","model_singer_statement","point_of_sale.group_pos_user",1,0,0,0
-"access_add_product","pos.add.product ","model_pos_add_product","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_confirm","pos.confirm","model_pos_confirm","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_discount","pos.discount","model_pos_discount","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_get_sale","pos.get.sale","model_pos_get_sale","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_close_statement","pos.open.statement","model_pos_open_statement","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0
-"acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_sale_user_today","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
-"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_payment_report","pos.payment.report","model_pos_payment_report","point_of_sale.group_pos_user",1,0,0,0
 "access_report_pos_order","report.pos.order","model_report_pos_order","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_return","pos.return","model_pos_return","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 65b5fb419d6..cb9a7a9ce03 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -34,7 +34,7 @@
                     <field name="balance_end"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+                    <button type="object" string="Open" name="button_open"  states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
                 </tree>
@@ -109,10 +109,10 @@
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft"  icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object"  icon="gtk-cancel" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -172,10 +172,10 @@
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -301,10 +301,11 @@
                         <field name="total_entry_encoding"/>
                       </group>
                       <group colspan="4">
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_open" states="draft" string="Open CashBox" type="object" />
-                        <button name="button_confirm" states="open" string="Confirm" type="object" />
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                        <button name="button_dummy" states="draft" icon="gtk-execute" string="Compute"/>
+                        <button name="button_confirm" states="open" icon="terp-gtk-go-back-rtl" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" icon="terp-camera_test" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm"  icon="gtk-cancel" string="Cancel" type="object" groups="base.group_extended"/>
+                        
                     </group>
                 </form>
             </field>
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index ce39ca9a684..f6d1e69d122 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -28,11 +28,11 @@ class company(osv.osv):
             help="This is the time frame analysed by the scheduler when "\
             "computing procurements. All procurements that are not between "\
             "today and today+range are skipped for futur computation."),
-    }
+                }
     _defaults = {
-        'schedule_range': lambda *a: 80.0,
-    }
+        'schedule_range': 80.0,
+                }
+
 company()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index e517f289809..1ca3a0bedc7 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -10,7 +10,7 @@
             <field name="model">procurement.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';green:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
@@ -19,6 +19,7 @@
                     <field name="procure_method"/>
                     <field name="state"/>
                     <field name="message"/>
+                    <field name="name" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -58,7 +59,7 @@
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
                             <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_check" states="confirmed" string="Run     Procurement" icon="gtk-media-play"/>
+                            <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
                         </group>
                     </page>
                     <page string="Extra Information">
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index bdc37c1b660..dc66d9e3e8b 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
+import time
+from mx import DateTime
+
 from osv import osv
 import netsvc
 import pooler
-from mx import DateTime
-import time
-
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
@@ -37,9 +37,7 @@ class procurement_order(osv.osv):
             context = {}
 
         if use_new_cursor:
-            print 'Cursor New', cr,
             cr = pooler.get_db(use_new_cursor).cursor()
-            print cr
         wf_service = netsvc.LocalService("workflow")
 
         procurement_obj = self.pool.get('procurement.order')
@@ -124,7 +122,6 @@ class procurement_order(osv.osv):
                 })
         if use_new_cursor:
             cr.commit()
-            print 'Cursor Close', cr
             cr.close()
         return {}
 
@@ -175,9 +172,7 @@ class procurement_order(osv.osv):
         if not context:
             context = {}
         if use_new_cursor:
-            print 'Cursor New', cr,
             cr = pooler.get_db(use_new_cursor).cursor()
-            print cr
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
         location_obj = self.pool.get('stock.location')
         procurement_obj = self.pool.get('procurement.order')
@@ -201,7 +196,7 @@ class procurement_order(osv.osv):
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
                     reste = qty % op.qty_multiple
                     if reste > 0:
-                        qty += op.qty_multiple - reste                    
+                        qty += op.qty_multiple - reste
                     newdate = DateTime.now() + DateTime.RelativeDateTime(
                             days = int(op.product_id.seller_delay))
                     if op.product_id.supply_method == 'buy':
@@ -241,9 +236,9 @@ class procurement_order(osv.osv):
                 })
         if use_new_cursor:
             cr.commit()
-            print 'Cursor Close', cr
             cr.close()
         return {}
+
 procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index 6cc6cc8acb4..8eeaefb3bd6 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -5,7 +5,3 @@
 "access_mrp_property","mrp.property","model_mrp_property",base.group_user,1,0,0,0
 "access_procurement","procurement.order","model_procurement_order",base.group_user,1,0,0,0
 "access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint",stock.group_stock_manager,1,1,1,1
-"access_procurement_compute_all","procurement.order.compute.all","model_procurement_order_compute_all",stock.group_stock_manager,1,1,1,1
-"access_procurement_orderpoint_compute","procurement.orderpoint.compute","model_procurement_orderpoint_compute",stock.group_stock_manager,1,1,1,1
-"access_mrp_make_procurement","make.procurement","model_make_procurement",stock.group_stock_manager,1,1,1,1
-"access_mrp_make_procurement","procurement.order.compute","model_procurement_order_compute",stock.group_stock_manager,1,1,1,1
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index ee3207833d3..cec7d13554d 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -30,36 +30,36 @@ from osv import fields,osv
 class procurement_compute(osv.osv_memory):
     _name = 'procurement.orderpoint.compute'
     _description = 'Automatic Order Point'
-    
+
     _columns = {
-           'automatic': fields.boolean('Automatic Orderpoint', help='If the stock of a product is under 0, it will act like an orderpoint'),     
+           'automatic': fields.boolean('Automatic Orderpoint', help='If the stock of a product is under 0, it will act like an orderpoint'),
     }
 
     _defaults = {
-            'automatic' : lambda *a: False,
+            'automatic': False,
     }
-    
+
     def _procure_calculation_orderpoint(self, cr, uid, ids, context):
-        """ 
+        """
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
-        """        
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
+        """
         proc_obj = self.pool.get('procurement.order')
         for proc in self.browse(cr, uid, ids):
             proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
-        
+
         return {}
-    
+
     def procure_calculation(self, cr, uid, ids, context):
-        """ 
+        """
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index a56c46bd299..c8d0d30d1de 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Stock Minimum Rules Only -->
-        
+
 		<record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
+                <label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-        <act_window name="Compute Stock Minimum Rules Only"		    
+        <act_window name="Compute Stock Minimum Rules Only"
 		    res_model="procurement.orderpoint.compute"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_procurement_compute"/>        
-		
+		    target="new"
+            key2="client_action_multi"
+		    id="action_procurement_compute"/>
+
 	</data>
-</openerp>	
+</openerp>
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 73efc77d017..9b2ac6d59b8 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -26,45 +26,41 @@ from osv import osv, fields
 class procurement_compute_all(osv.osv_memory):
     _name = 'procurement.order.compute.all'
     _description = 'Compute all schedulers'
-    
+
     _columns = {
         'automatic': fields.boolean('Automatic orderpoint',help='Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.'),
     }
-    
+
     _defaults ={
          'automatic': lambda *a: False,
     }
-    
+
     def _procure_calculation_all(self, cr, uid, ids, context):
-        """ 
+        """
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
         """
         proc_obj = self.pool.get('procurement.order')
         for proc in self.browse(cr, uid, ids):
-            print 'Cursor', cr
             proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
                     context=context)
-            print 'Cursor', cr
         return {}
 
     def procure_calculation(self, cr, uid, ids, context):
-        """ 
+        """
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
+        @param ids: List of IDs selected
+        @param context: A standard dictionary
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}
-    
+
 procurement_compute_all()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 4af54b7409e..40c72ee68c7 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Schedulers -->
-        
+
 		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters">
+                <label string="Wizard run all the procurements, and generate task, production order or purchase order based on the product type" colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-         <act_window name="Compute Schedulers"		    
+         <act_window name="Compute Schedulers"
 		    res_model="procurement.order.compute.all"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_compute_schedulers"/>            
-        
+		    target="new"
+            key2="client_action_multi"
+		    id="action_compute_schedulers"/>
+
 	</data>
-</openerp>	
+</openerp>
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index b0f799cc608..82a676836ec 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 5a56a45c785..328d8d5707f 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -44,9 +44,9 @@ class product_pricelist(report_sxw.rml_parse):
         qtys = 1
 
         for i in range(1,6):
-            if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
-                vals['qty'+str(qtys)] = form['qty'+str(i)]
-                qtys += 1
+#            if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
+            vals['qty'+str(qtys)] = form['qty'+str(i)]
+            qtys += 1
         lst.append(vals)
         return lst
 
@@ -55,8 +55,8 @@ class product_pricelist(report_sxw.rml_parse):
             q = 'qty%d'%i
             if form[q] >0 and form[q] not in self.quantity:
                 self.quantity.append(form[q])
-#            else:
-#                self.quantity.append(0)
+            else:
+                self.quantity.append(0)
         return True
 
     def _get_pricelist(self, pricelist_id):
@@ -93,12 +93,12 @@ class product_pricelist(report_sxw.rml_parse):
                 i = 1
                 for qty in self.quantity:
                     if qty == 0:
-                        val['qty'+str(i)] = ""
+                        val['qty'+str(i)] = 0.0
                     else:
                         val['qty'+str(i)]=self._get_price(self.pricelist, product['id'], qty)
-                        i += 1
+                    i += 1
                 products.append(val)
-            res.append({'name':cat['name'],'products':products})
+            res.append({'name':cat['name'],'products': products})
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index 2b3f27f0de1..0e95299de0d 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 42f8bdc2629..05a8392bbfe 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_electronic
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 7607c499add..e80f14ae490 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -31,7 +31,10 @@ the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
     'depends': ['base', 'product', 'account'],
-    'update_xml': ['wizard/product_margin_view.xml','product_margin_view.xml'],
+    'update_xml': [
+                   'security/ir.model.access.csv',
+                   'wizard/product_margin_view.xml',
+                   'product_margin_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index b70733ee992..b5421d3798c 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -42,7 +42,7 @@ class product_product(osv.osv):
             invoice_types=()
             states=()
             if invoice_state=='paid':
-                states=('paid')
+                states=('paid',)
             elif invoice_state=='open_paid':
                 states=('open','paid')
             elif invoice_state=='draft_open_paid':
diff --git a/addons/product_margin/security/ir.model.access.csv b/addons/product_margin/security/ir.model.access.csv
index 51d88da9d81..0343f29f43a 100644
--- a/addons/product_margin/security/ir.model.access.csv
+++ b/addons/product_margin/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_margin","product.margin","model_product_margin",,1,0,0,0
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
new file mode 100644
index 00000000000..6ea1da38a59
--- /dev/null
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -0,0 +1,47 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-07-02 12:04+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\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: 2010-07-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Vidni popust"
diff --git a/addons/product_visible_discount/product.py b/addons/product_visible_discount/product.py
index e81dac8668e..53c6446c57e 100644
--- a/addons/product_visible_discount/product.py
+++ b/addons/product_visible_discount/product.py
@@ -46,6 +46,25 @@ class sale_order_line(osv.osv):
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True,date_order=False,packaging=False,fiscal_position=False, flag=False):
 
+        def get_real_price(res_dict, product_id, pricelist):
+            item_obj = self.pool.get('product.pricelist.item')
+            price_type_obj = self.pool.get('product.price.type')
+            product_obj = self.pool.get('product.product')
+            template_obj = self.pool.get('product.template')
+            field_name = 'list_price'
+
+            if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
+                item = res_dict['item_id'].get(pricelist,False)
+                item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
+                if item_base > 0:
+                    field_name = price_type_obj.browse(cr, uid, item_base).field
+
+            product_tmpl_id = product_obj.browse(cr, uid, product_id, context).product_tmpl_id.id
+
+            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            return product_read[field_name]
+
+
         res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
             lang, update_tax,date_order,fiscal_position=fiscal_position,flag=flag)
@@ -68,15 +87,16 @@ class sale_order_line(osv.osv):
 #            product_read = self.pool.get('product.template').read(cr, uid, product_tmpl_id, [field_name], context)
 #            list_price = product_read[field_name]
             list_price = pricelist_obj.price_get(cr, uid, [pricelist],
-                    product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })[pricelist]
+                    product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order })
 
-            pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
+            pricelists = pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
 
             old_uom = product.uos_id or product.uom_id
-            new_list_price = product_uom_obj._compute_price(cr,
-                        uid, old_uom.id, list_price, uom)
-            if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price != 0):
-                discount=(new_list_price-price) / new_list_price * 100
+#            new_list_price = product_uom_obj._compute_price(cr,
+#                        uid, old_uom.id, list_price, uom)
+            new_list_price = get_real_price(list_price, product.id, pricelist)
+            if(len(pricelists)>0 and pricelists[0]['visible_discount'] and list_price[pricelist] != 0):
+                discount = (new_list_price - price) / new_list_price * 100
                 result['price_unit'] = new_list_price
                 result['discount'] = discount
             else:
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
index a46b61c89a2..0343f29f43a 100644
--- a/addons/profile_tools/security/ir.model.access.csv
+++ b/addons/profile_tools/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_misc_tools_installer","misc_tools.installer","model_misc_tools_installer",base.group_system,1,1,1,1
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 03b72e09e38..c3784c457b1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Project Management",
+    "name": "Project Management",
     "version": "1.1",
-    "author" : "Tiny",
-    "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "analytic", "process", "mail_gateway","board"],
+    "author": "Tiny",
+    "website": "http://www.openerp.com",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["product", "analytic", "process", "mail_gateway","board"],
     "description": """Project management module that track multi-level projects, tasks,
 work done on tasks, eso. It is able to render planning, order tasks, eso.
  Dashboard for project members that includes:
@@ -35,7 +35,7 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
     * Members list of project
     * Issues
     """,
-    "init_xml" : [],
+    "init_xml": [],
     "update_xml": [
         "security/project_security.xml",
         "wizard/project_task_delegate_view.xml",
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index 3c32361e5ec..f62c292e779 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -21,8 +21,6 @@
 <!--            <field name="domain">[('user_id','in',department_users_get())]</field>-->
 <!--        </record>-->
 
-
-
         <record id="board_project_manager_form" model="ir.ui.view">
             <field name="name">board.project.manager.form</field>
             <field name="model">board.board</field>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 3e65798e5d8..f9e2dc5dd52 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -125,11 +125,12 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_86"
-            name="Project"
-            parent="base.dashboard"/>
+            name="Dashboard"
+            icon="terp-graph"
+            sequence="0"
+            parent="base.menu_project_report"/>
         <menuitem
             action="open_board_project"
             icon="terp-graph"
diff --git a/addons/project/company.py b/addons/project/company.py
index f745739bf60..f0e66e468b4 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -28,9 +28,9 @@ class res_company(osv.osv):
             help='This will set the unit of measure used in projects and tasks.\n' \
 "If you use the timesheet linked to projects (project_timesheet module), don't " \
 "forget to setup the right unit of measure in your employees.",
-
         ),
     }
+
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 4950c13eed8..806770e7537 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 06450cbac8e..278cc6c9a80 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -54,7 +54,7 @@ msgstr ""
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -202,9 +202,7 @@ msgstr ""
 "Очаквано време за да валидирате извършената от назначения потребител работа."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Бележки"
@@ -220,8 +218,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -245,14 +242,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -316,8 +311,7 @@ msgid "Extra Info"
 msgstr "Допълнителна информация"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -395,8 +389,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Вид"
 
@@ -423,11 +416,9 @@ msgid "Medium"
 msgstr "Средно"
 
 #. module: project
-#: view:config.compute.remaining:0
-#: field:config.compute.remaining,remaining_hours:0
-#: field:project.task,remaining_hours:0
+#: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Оставащи часове"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
@@ -440,8 +431,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -492,20 +482,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Настройка"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Проекти"
 
@@ -535,9 +522,9 @@ msgid "User: %(user_id)s"
 msgstr "Потребител: %(user_id)s"
 
 #. module: project
-#: field:project.task,delay_hours:0
+#: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Часове забавяне"
 
 #. module: project
 #: field:project.project,contact_id:0
@@ -557,20 +544,17 @@ msgstr "Невалиден XML за преглед на архитектурат
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Проекти"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Задачи"
 
@@ -617,9 +601,9 @@ msgid "Status: %(state)s"
 msgstr "Статус: %(state)s"
 
 #. module: project
-#: view:project.task:0
+#: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Планирани"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -658,8 +642,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Чернова"
 
@@ -674,10 +657,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Изчакване"
@@ -700,8 +681,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -801,9 +781,9 @@ msgid "Delegated To"
 msgstr ""
 
 #. module: project
-#: field:project.task,date_close:0
+#: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Дата на приключване"
 
 #. module: project
 #: field:project.task,user_id:0
@@ -874,10 +854,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Готово"
@@ -886,8 +864,7 @@ msgstr "Готово"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -909,9 +886,9 @@ msgid "ID: %(task_id)s"
 msgstr "ID: %(task_id)s"
 
 #. module: project
-#: selection:project.task,state:0
+#: selection:report.closed.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В прогрес"
 
 #. module: project
 #: constraint:ir.model:0
@@ -932,9 +909,9 @@ msgid "Parent Task"
 msgstr "Родителска задача"
 
 #. module: project
-#: view:project.task:0
+#: view:report.closed.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Закъснение"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -967,9 +944,9 @@ msgid "New title of your own task to validate the work done."
 msgstr ""
 
 #. module: project
-#: field:project.task,progress:0
+#: field:report.closed.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Напредък (%)"
 
 #. module: project
 #: field:project.task,description:0
@@ -1065,8 +1042,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Последователност"
 
@@ -1128,8 +1104,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1138,3 +1113,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Приключени задачи по проект (текущ месец)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Приключени задачи по проект и по потребител"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Приключени задачи по проект и по потребител (текущ месец)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Ефективни часове"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Задачи според потребител и проект"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Приключване на задача"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Задачи по проект"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Управление на продажби – справки"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Потребител"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Задачи по проект и по потребител"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Текущ месец"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Задачи по проекти и по потребители"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Прибл. закъснение на приключването"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Задачи по проект"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Приключени задачи по проект"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Задачи според потребител"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Няма задача"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Доклад на задачите по проекти според потребител"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "График / Часове задачи на месец"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Справки"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Приключени задачи през последните 15 дни"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Часове задачи"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Номер на задача"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "report.timesheet.task.user"
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "График / Доклад на часовете задачи на месец"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Напредък на задачата"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Доклад за приключена задача"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Часове по график"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Приключени задачи"
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index df712b7c29e..8e4362b5ea7 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -54,7 +54,7 @@ msgstr ""
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,12 +217,9 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
-#: field:project.task,project_id:0
-#: model:res.request.link,name:project.req_link_project
+#: model:ir.ui.menu,name:project.next_id_86
 msgid "Project"
-msgstr ""
+msgstr "Projekat"
 
 #. module: project
 #: view:project.task:0
@@ -244,14 +239,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +308,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -348,9 +340,9 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Moji projekti"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -394,8 +386,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +430,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +481,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +543,17 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -605,10 +589,9 @@ msgid "Computed as: Time Spent / Total Time."
 msgstr ""
 
 #. module: project
-#: model:ir.actions.act_window,name:project.action_view_task4
-#: model:ir.ui.menu,name:project.menu_action_view_task4
+#: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Moji zadaci"
 
 #. module: project
 #: view:project.project:0
@@ -657,8 +640,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +655,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +679,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +852,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +862,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1038,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1100,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1109,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Planiranje mog projekta"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Vremenski izvještaj"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Rokovi mojih zadataka"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Javne bilješke"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Kontrolna ploča za projekte"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Tabla za korisnike projekta"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Cjevovod za zadatke"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Moje planiranje"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Moji računi za fakturiranje"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Nadzorna ploča vođe projekta"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Moji rokovi"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Vremenski raporti korisnika"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tabla vođe projekta"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Moji otvoreni zadaci"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Moja tabla"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Moja tabla zadataka"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Moj vremenski raport"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 3495ba67bd1..1785111e143 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -213,9 +213,7 @@ msgstr ""
 "el qual delegueu aquesta tasca."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notes"
@@ -231,8 +229,7 @@ msgid "Analysis"
 msgstr "Anàlisi"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -258,14 +255,12 @@ msgstr ""
 "mateixa notació."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Capçalera correu"
 
@@ -332,8 +327,7 @@ msgid "Extra Info"
 msgstr "Informació extra"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
@@ -413,8 +407,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculat com: Temps dedicat + Temps restant."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipus"
 
@@ -458,8 +451,7 @@ msgid "Planned Time"
 msgstr "Temps estimat"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Treball de tasca"
@@ -510,20 +502,17 @@ msgid "Template"
 msgstr "Plantilla"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuració"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Data d'inici"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projectes"
 
@@ -575,20 +564,17 @@ msgstr "XML invàlid per a la definició de la vista!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projectes"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Temps dedicat"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -678,8 +664,7 @@ msgstr "Activa factures des de línies de comandes de venda"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
@@ -694,10 +679,8 @@ msgid "Project Manager"
 msgstr "Responsable de projecte"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Pendent"
@@ -722,8 +705,7 @@ msgid "Project Time Unit"
 msgstr "Unitat de temp projecte"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nom del projecte"
 
@@ -915,10 +897,8 @@ msgstr ""
 "els projectes, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Realitzat"
@@ -927,8 +907,7 @@ msgstr "Realitzat"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1005,8 +984,7 @@ msgstr "Tanca silenciosament"
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
-"Nou títol de la vostra pròpia tasca per validar el treball realitzat."
+msgstr "Nou títol de la vostra pròpia tasca per validar el treball realitzat."
 
 #. module: project
 #: field:project.task,progress:0
@@ -1111,8 +1089,7 @@ msgid "Template of Projects"
 msgstr "Plantilla de projectes"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Seqüència"
 
@@ -1176,8 +1153,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegueu la vostra tasca a un altre usuari"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Peu correu"
 
@@ -1186,3 +1162,279 @@ msgstr "Peu correu"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Projectes en execució"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "La meva planificació de projectes"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Fulls de treball"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Les meves dates límit de tasques"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notes públiques"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Taulell de projectes"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Taulell per a usuaris de projectes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Encadenament de tasques"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "La meva planificació"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Els meus comptes a facturar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Taulell responsable de projectes"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Les meves dates límit"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Fulls de serveis d'usuari"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Taulell del responsable de projectes"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Les meves tasques obertes"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "El meu taulell"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "El meu taulell de tasques"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "El meu encadenament de tasques d'usuari"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "La meva agenda"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Tasques finalitzades per projecte (aquest mes)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tasques tancades per projecte i usuari"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Tasques finalitzades per projecte i usuari (aquest mes)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Hores reals"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tasques per usuari i projecte"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Tasca tancada"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tasques per Projecte"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Informes - Gestió de projectes"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Usuari"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tasques per projecte i usuari"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Aquest mes"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tasques per projectes i usuaris"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Mitjana retard de tancament"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Tasques per projecte"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Promig Pla.-Real"
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tasques tancades per projecte"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Tasques per usuari"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "No hi ha tasca"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Informe de tasques per usuari per projectes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Temps / Hores de tasques per mes"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Proporciona estadístiques de tasques per usuari en projectes per a comprovar "
+"el treball encadenat dels usuaris."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Tasques tancades en els últims 15 dies"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Hores de tasca"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index e26336d46c9..69732fdea72 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Poznámky"
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr "Analýza"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Zrušeno"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Hlavička e-mailu"
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr "Další informace"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Typ"
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr "Plánovaný čas"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr "Šablona"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfigurace"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Počáteční datum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekty"
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Správa projektů"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Strávený čas"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Úkoly"
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Koncept"
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Nevyřízené"
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Jméno projektu"
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 02e4175939d..c38310b961f 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -208,9 +208,7 @@ msgid ""
 msgstr "Erwartete Zeit für die Erledigung der delegierten Aufgabe"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Bemerkungen"
@@ -226,8 +224,7 @@ msgid "Analysis"
 msgstr "Analyse der Plandaten"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -253,14 +250,12 @@ msgstr ""
 "Namenskonvention."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Mail Header"
 
@@ -297,8 +292,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr ""
-"Entferne Beschreibung der Aufgabe in der Aufgabenliste des Benutzers."
+msgstr "Entferne Beschreibung der Aufgabe in der Aufgabenliste des Benutzers."
 
 #. module: project
 #: field:project.project,category_id:0
@@ -328,8 +322,7 @@ msgid "Extra Info"
 msgstr "Extra Information"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -409,8 +402,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Typ"
 
@@ -454,8 +446,7 @@ msgid "Planned Time"
 msgstr "Geplante Zeit"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Aufgabenliste Arbeit"
@@ -506,20 +497,17 @@ msgid "Template"
 msgstr "Vorlage"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Anfangsdatum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekte"
 
@@ -571,20 +559,17 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projekte"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Zeitbedarf"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Aufgaben"
 
@@ -672,8 +657,7 @@ msgstr "Erzeugt Rechnungen basierend auf Verkaufsaufträgen"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
@@ -688,10 +672,8 @@ msgid "Project Manager"
 msgstr "Projekt Manager"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Im Wartezustand"
@@ -716,8 +698,7 @@ msgid "Project Time Unit"
 msgstr "Projekt Zeiteinheit"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Projekt Bezeichnung"
 
@@ -905,10 +886,8 @@ msgstr ""
 "Arbeitszeitaufzeichnungen zugeordnet werden."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Erledigt"
@@ -917,8 +896,7 @@ msgstr "Erledigt"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1059,8 +1037,8 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
-"Falls Sie dieses Feld anhaken, erhält der Projektmanager jedesmal eine EMail "
-" wenn eine Aufgabe erledigt ist."
+"Falls Sie dieses Feld anhaken, erhält der Projektmanager jedesmal eine "
+"EMail  wenn eine Aufgabe erledigt ist."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
@@ -1099,8 +1077,7 @@ msgid "Template of Projects"
 msgstr "Meine Projektvorlage"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Sequenzer"
 
@@ -1164,8 +1141,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegiere Aufgaben an anderen Benutzer"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Mail Footer"
 
@@ -1174,3 +1150,277 @@ msgstr "Mail Footer"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Laufende Projekte"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Meine geplanten Projekte"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Zeiterfassung"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Meine Aufgaben Deadlines"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Öffentliche Anmerkungen"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Projektmitarbeiter Dashboard"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Tafel für Projekt Mitarbeiter"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Aufgabenbestand"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Meine Planung"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Meine abrechenbaren Zeiten"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Projektmanager Dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Meine Deadlines"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Benutzer Zeiterfassung"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Dashboard Projektmanager"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Meine offenen Aufgaben"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mein Dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Meine Aufgaben (Dashboard)"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Meine Benutzer"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Meine Zeiterfassung"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Aufgaben nach Projekten (dieser Monat)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Fertige Aufgaben nach Projekt und Benutzer"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Erl. Aufgaben nach Projekt und Benutzer (d. Monat)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Effektive Stunden"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Aufgaben nach Benutzer und Projekt"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Beendete Aufgaben"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Aufgaben nach Projekt"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Verkaufsverwaltung - Berichte"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Aufgaben nach Projekt und Benutzer"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Dieser Monat"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Aufgaben nach Projekten und Benutzern"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Durch. Verzögerung"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Aufgaben nach Projekten"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Durch. Plan. - Eff."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Erl. Aufgaben nach Projekt"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Aufgaben je Benutzer"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Keine Aufgabe"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Report je Aufgabe und Benutzer je Projekt"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Arbeitszeitaufzeichnung / Stunden je Monat"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Berichtswesen"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr "Statistik über offene Aufgaben (Pipeline) je Benutzer"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Erledigte Aufgaben der letzten 15 Tage"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Aufgabe Stunden"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Aufgaben Nummer"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "report.timesheet.task.user"
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Arbeitszeitaufzeichnung/Aufgaben Stunden je Monat"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Aufgaben-Fortschritt"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Abgeschlossene Aufgaben Bericht"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Arbeitszeitaufzeichnung Stunden"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Abgeschlossene Aufgaben"
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 7e4d3040364..06dd3807719 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -213,9 +213,7 @@ msgstr ""
 "του χρήστη στον οποίο έχετε αναθέσει την εργασία."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Σημειώσεις"
@@ -231,8 +229,7 @@ msgid "Analysis"
 msgstr "Ανάλυση"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -256,14 +253,12 @@ msgid ""
 msgstr "Αυτόματες παράμετροι κεφαλίδων και υποσέλιδων"
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Κεφαλίδα Μηνύματος"
 
@@ -329,8 +324,7 @@ msgid "Extra Info"
 msgstr "Επιπλέον Πληροφορίες"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Συνεργάτης"
 
@@ -410,8 +404,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Υπολογισμένο ως εξής: Χρόνος που Αναλώθηκε + Υπολοιπο Χρόνου"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Τύπος"
 
@@ -455,8 +448,7 @@ msgid "Planned Time"
 msgstr "Προγραμματισμένος Χρόνος"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -507,20 +499,17 @@ msgid "Template"
 msgstr "Πρότυπο"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Ημερ/νία Εκκίνησης"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Έργα"
 
@@ -572,20 +561,17 @@ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Διαχείριση Έργου"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Χρόνος που Αναλώθηκε"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Εργασίες"
 
@@ -673,8 +659,7 @@ msgstr "Δημιουργία τιμολογίων από γραμμή πωλήσ
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Πρόχειρα"
 
@@ -689,10 +674,8 @@ msgid "Project Manager"
 msgstr "Διαχειριστής Έργου"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Σε εκκρεμότητα"
@@ -717,8 +700,7 @@ msgid "Project Time Unit"
 msgstr "Μονάδα Χρόνου Έργου"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Όνομα Έργου"
 
@@ -846,8 +828,7 @@ msgstr ""
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Άθροισμα ωρών εργασίας που αναλώθηκαν σε όλες τις Εργασίες του Έργου."
+msgstr "Άθροισμα ωρών εργασίας που αναλώθηκαν σε όλες τις Εργασίες του Έργου."
 
 #. module: project
 #: help:project.task,project_id:0
@@ -907,10 +888,8 @@ msgstr ""
 "ανάλυση κόστους και εσόδων, φύλλα χρόνου εργασίας κλπ."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Ολοκληρώθηκε"
@@ -919,8 +898,7 @@ msgstr "Ολοκληρώθηκε"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1101,8 +1079,7 @@ msgid "Template of Projects"
 msgstr "Πρότυπο Έργου"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Ιεράρχηση"
 
@@ -1166,8 +1143,7 @@ msgid "Delegate your task to the other user"
 msgstr "Ανάθεση εργασίας στον άλλο χρήστη"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Υποσέλιδο Mail"
 
@@ -1177,19 +1153,112 @@ msgstr "Υποσέλιδο Mail"
 msgid "Running projects"
 msgstr "Έργα σε εξέλιξη"
 
-#, python-format
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Σχεδιασμός Έργων μου"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Φύλλα Χρόνου Εργασίας"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Προθεσμίες Αναθέσεών μου"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Κοινοποιημένες Σημειώσεις"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Πίνακας Έργων"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Πίνακας Χρηστών Έργου"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Κανάλι Αναθέσεων"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Ο Σχεδιασμός μου"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Οι λογαριασμοί μου προς τιμολόγηση"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Πίνακας Αναφορών Διευθυντή Έργου"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Οι Προθεσμίες μου"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Φύλλα χρόνου χρηστών"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Πίνακας διευθυντή έργου"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Οι Ανοικτές Αναθέσεις μου"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Ο Πίνακάς μου"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Ο πίνακας αναθέσεών μου"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Το κανάλι μου"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Το Φύλλο Χρόνου μου"
+
 #~ msgid ""
 #~ "Couldn't send mail because the contact for this task (%s) has no email "
 #~ "address!"
 #~ msgstr ""
-#~ "Το mail δεν μπόρεσε να σταλλεί διότι η επαφή για την εργασία (%s) δεν έχει "
-#~ "διεύθυνση email!"
+#~ "Το mail δεν μπόρεσε να σταλλεί διότι η επαφή για την εργασία (%s) δεν "
+#~ "έχει διεύθυνση email!"
 
-#, python-format
 #~ msgid "Operation Not Permitted !"
 #~ msgstr "Μη Επιτρεπτή Λειτουργία!"
 
-#, python-format
 #~ msgid ""
 #~ "A new project has been created !\n"
 #~ "We suggest you to close this one and work on this new project."
@@ -1197,20 +1266,16 @@ msgstr "Έργα σε εξέλιξη"
 #~ "Ένα νέο έργο δημιουργήθηκε!\n"
 #~ "Σας προτείνουμε να κλείσετε αυτό και να εργαστείτε στο νέο."
 
-#, python-format
 #~ msgid "Operation Done"
 #~ msgstr "Λειτουργία Ολοκληρώθηκε"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Σφάλμα"
 
-#, python-format
 #~ msgid "Couldn't send mail because your email address is not configured!"
 #~ msgstr ""
 #~ "Δεν έχετε ρυθμίσει τη διεύθυνση email  σας! Αδύνατη η αποστολή μηνύματος."
 
-#, python-format
 #~ msgid ""
 #~ "You can not delete a project with tasks. I suggest you to deactivate it."
 #~ msgstr ""
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 7f5b605cdf1..799b38a1352 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-23 17:31+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -213,9 +213,7 @@ msgstr ""
 "en el cual delega esta tarea."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -231,8 +229,7 @@ msgid "Analysis"
 msgstr "Análisis"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -258,14 +255,12 @@ msgstr ""
 "notación."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Cabecera correo"
 
@@ -332,8 +327,7 @@ msgid "Extra Info"
 msgstr "Información extra"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
@@ -413,8 +407,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -458,8 +451,7 @@ msgid "Planned Time"
 msgstr "Tiempo estimado"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Trabajo de tarea"
@@ -510,20 +502,17 @@ msgid "Template"
 msgstr "Plantilla"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Proyectos"
 
@@ -575,20 +564,17 @@ msgstr "¡XML inválido para la definición de la vista!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Proyectos"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Tiempo dedicado"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -678,8 +664,7 @@ msgstr "Activar facturas desde líneas de pedidos de venta"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Borrador"
 
@@ -694,10 +679,8 @@ msgid "Project Manager"
 msgstr "Responsable de proyecto"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Pendiente"
@@ -722,8 +705,7 @@ msgid "Project Time Unit"
 msgstr "Unidad de tiempo proyecto"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nombre del proyecto"
 
@@ -915,10 +897,8 @@ msgstr ""
 "en los proyectos, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Realizado"
@@ -927,8 +907,7 @@ msgstr "Realizado"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1110,8 +1089,7 @@ msgid "Template of Projects"
 msgstr "Plantilla de proyectos"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
@@ -1175,8 +1153,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Pie correo"
 
@@ -1185,3 +1162,279 @@ msgstr "Pie correo"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Proyectos en ejecución"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mi planificación de proyectos"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mis fechas límite de tareas"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablero de proyectos"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Tablero para usuarios de proyectos"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Encadenamiento de tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Mi planificación"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mis cuentas a facturar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tablero responsable de proyectos"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mis fechas límite"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Hojas de servicios de usuario"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tablero del responsable de proyectos"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mi tablero de tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Mi encadenamiento de tareas de usuario"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mi agenda"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Tareas finalizadas por proyecto (este mes)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tareas cerradas por proyecto y usuario"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Tareas finalizadas por proyecto y usuario (este mes)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Horas reales"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tareas por usuario y proyecto"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Tarea cerrada"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tareas por Proyecto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Informes - Gestión de proyectos"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tareas por proyecto y usuario"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tareas por proyectos y usuarios"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Promedio demora de cierre"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Tareas por proyecto"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Promedio Plan.-Real"
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tareas cerradas por proyecto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Tareas por usuario"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "No hay tarea"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Informe de tareas por usuario para proyectos"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Tiempo / Horas de tareas por mes"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Proporciona estadísticas de tareas por usuario en proyectos para comprobar "
+"el trabajo encadenado de los usuarios."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Tareas cerradas en los últimos 15 días"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Horas de tarea"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Número de tarea"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Progreso de la tarea"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Tareas cerradas"
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index a4029961aa2..02a99efcf3f 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -212,9 +212,7 @@ msgstr ""
 "quien ha delegado esta tarea."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -230,8 +228,7 @@ msgid "Analysis"
 msgstr "Análisis"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -257,14 +254,12 @@ msgstr ""
 "exactamente la misma notación."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Encabezado del correo"
 
@@ -331,8 +326,7 @@ msgid "Extra Info"
 msgstr "Información extra"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -412,8 +406,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -457,8 +450,7 @@ msgid "Planned Time"
 msgstr "Tiempo previsto"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Trabajo de Tarea"
@@ -509,20 +501,17 @@ msgid "Template"
 msgstr "Plantilla"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Fecha de inicio"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Proyectos"
 
@@ -574,20 +563,17 @@ msgstr "XML inválido para la definición de la vista!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Gestión de proyectos"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Tiempo dedicado"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -677,8 +663,7 @@ msgstr "Activar facturas desde líneas de pedidos de venta"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Borrador"
 
@@ -693,10 +678,8 @@ msgid "Project Manager"
 msgstr "Responsable de proyecto"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Pendiente"
@@ -721,8 +704,7 @@ msgid "Project Time Unit"
 msgstr "Unidad de tiempo del proyecto"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nombre del proyecto"
 
@@ -914,10 +896,8 @@ msgstr ""
 "en los proyectos, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Realizado"
@@ -926,8 +906,7 @@ msgstr "Realizado"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1109,8 +1088,7 @@ msgid "Template of Projects"
 msgstr "Plantilla de proyectos"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
@@ -1174,8 +1152,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegar su tarea a otro usuario"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Pie de correo"
 
@@ -1184,3 +1161,279 @@ msgstr "Pie de correo"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Proyectos en ejecución"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mi planificación de proyectos"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Hojas de tareas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mis fechas límite de tareas"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablero de proyectos"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Tablero para usuarios de proyectos"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Flujo de tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Mi planificación"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mis cuentas a facturar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tablero de gestión de proyectos"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mis fechas límite"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Hojas de tareas de usuario"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tablero de proyectos"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mis tareas abiertas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mi tablero"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mi tablero de tareas"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Mi flujo de tareas de usuario"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mi Hoja de tareas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Tareas finalizadas por proyecto (este mes)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tareas cerradas por proyecto y usuario"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Tareas finalizadas por proyecto y usuario (este mes)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Horas reales"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tareas por usuario y proyecto"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Tarea cerrada"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tareas por Proyecto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestión de ventas - Informes"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tareas por proyecto y usuario"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tareas por proyectos y usuarios"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Promedio demora de cierre"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Tareas por proyecto"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Promedio Plan.-Real"
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tareas cerradas por proyecto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Tareas por usuario"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "No hay tarea"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Informe de tareas para proyectos por usuario"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Hojas de tarea / Horas de tareas por mes"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Informes"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Proporciona estadísticas de tareas por usuario en proyectos para controlar "
+"el flujo de trabajo de los usuarios."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Tareas cerradas en los últimos 15 días"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Horas de tarea"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Número de tarea"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index 74de3ee15ab..3da7c9c8721 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -210,9 +210,7 @@ msgstr ""
 "valideerimiseks."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Märkmed"
@@ -228,8 +226,7 @@ msgid "Analysis"
 msgstr "Analüütiline"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -254,14 +251,12 @@ msgstr ""
 "Automaatsed muutujad päistele ja jalustele. Kasuta täpselt sama kirjaviisi."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Tühistatud"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Kirja päis"
 
@@ -327,8 +322,7 @@ msgid "Extra Info"
 msgstr "Täiendav info"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -409,8 +403,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Arvutuskäik: kulutatud aeg + järelejäänud aeg"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tüüp"
 
@@ -454,8 +447,7 @@ msgid "Planned Time"
 msgstr "Planeeritud aeg"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Ülesande töö"
@@ -506,20 +498,17 @@ msgid "Template"
 msgstr "Mall"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Seadistus"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Alguskuupäev"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projektid"
 
@@ -571,20 +560,17 @@ msgstr "Vigane XML vaate arhitektuurile!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projektihaldus"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Kulutatud aeg"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Ülesanded"
 
@@ -672,8 +658,7 @@ msgstr "Käivita arved müügikorralduse ridadest"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Mustand"
 
@@ -688,10 +673,8 @@ msgid "Project Manager"
 msgstr "Projektihaldur"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Lahtine"
@@ -716,8 +699,7 @@ msgid "Project Time Unit"
 msgstr "Projekti ajaühik"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Projekti nimi"
 
@@ -902,10 +884,8 @@ msgstr ""
 "kulude ja tulude ananlüüsiga, tööajalehtedega jms."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Valmis"
@@ -914,8 +894,7 @@ msgstr "Valmis"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1096,8 +1075,7 @@ msgid "Template of Projects"
 msgstr "Projektide mallid"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Jada"
 
@@ -1161,8 +1139,7 @@ msgid "Delegate your task to the other user"
 msgstr "Volita oma ülesanne teisele kasutajale."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Kirja jalus"
 
@@ -1171,3 +1148,277 @@ msgstr "Kirja jalus"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Jooksvad projektid"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Minu projektide planeerimine"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Tööajalehed"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Minu ülesannete tähtajad"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Avalikud märkmed"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Projekti töölaud"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Töölaud projekti kasutajatele"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Ülesannete ootel tööd"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Minu planeerimine"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Minu kontod arveldada"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Projektijuhi töölaud"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Minu tähtajad"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Kasutaja tööajalehed"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Projektijuhi laud"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Minu lahtised ülesanded"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Minu laud"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Minu ülesannete laud"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Minu kasutaja ootel tööd"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Minu tööajaleht"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Ülesanded lõpetatud projektijärgi (käesoleval kuul)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Ülesanded suletud Kategooria ja Kasutajajärgi"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Ülesanded lõpetatud projekt ja kasutajajärgi (käesoleval kuul)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Ehfektiivsed Tunnid"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Ülesanded kasutaja ja projektijärgi"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Ülesanne suletud"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Ülesanded Projektijärgi"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Müügihaldus - Aruandlus"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Ülesanded Projekti ja Kasutajajärgi"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Käesolev kuu"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Ülesanded projektide ja kasutajatejärgi"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Keskmine sulgemise viivitus"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Ülesanded projektijärgi"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Keskm. Plaani.- Effect."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Ülesanded Suletud Projektijärgi"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Ülesanded kasutaja järgi"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Ülesanne puudub"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Tööajaleht / Ülesannete tunnid kuu kaupa"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Aruandlus"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Viimase 15 päeva jooksul suletud ülesanded"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Ülesande tunnid"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Tegumi number"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Ülesande edenemine"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Suletud ttegumi aruanne"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Töögraafiku tunnid"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Suletud tegumid"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index ab9147bd805..74304535059 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -54,7 +54,7 @@ msgstr "Ouvrir les tâches ouvertes"
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du model invalide pour la définition de l'action."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -212,9 +212,7 @@ msgstr ""
 "délégué la tâche la termine."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notes"
@@ -230,8 +228,7 @@ msgid "Analysis"
 msgstr "Analyses"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -257,14 +254,12 @@ msgstr ""
 "notation."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Annulé"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Entête du mail"
 
@@ -331,8 +326,7 @@ msgid "Extra Info"
 msgstr "Infos Complémentaires"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
@@ -413,8 +407,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculer comme: Temps passé + Temps restant"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Type"
 
@@ -458,8 +451,7 @@ msgid "Planned Time"
 msgstr "Temps planifié"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Travail effectué"
@@ -512,20 +504,17 @@ msgid "Template"
 msgstr "Modèle"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuration"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Démarrage du projet"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projets"
 
@@ -577,20 +566,17 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Gestion de projets"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Temps passé"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tâches"
 
@@ -680,8 +666,7 @@ msgstr "Déclencher des factures depuis des lignes de commandes de ventes"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
@@ -696,10 +681,8 @@ msgid "Project Manager"
 msgstr "Responsable du projet"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "En attente"
@@ -725,8 +708,7 @@ msgid "Project Time Unit"
 msgstr "Unité de temps du projet"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nom du Projet"
 
@@ -867,8 +849,7 @@ msgstr ""
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Sommes des heures planifiées de toutes les tâches reliées à ce projet."
+msgstr "Sommes des heures planifiées de toutes les tâches reliées à ce projet."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -914,10 +895,8 @@ msgstr ""
 "prestations sur des projets, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Effectué"
@@ -926,8 +905,7 @@ msgstr "Effectué"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1109,8 +1087,7 @@ msgid "Template of Projects"
 msgstr "Modèle de projets"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Séquence"
 
@@ -1174,8 +1151,7 @@ msgid "Delegate your task to the other user"
 msgstr "Délégué votre tâche à un autre utilisateur"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "pied du mail"
 
@@ -1184,3 +1160,277 @@ msgstr "pied du mail"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Projets en cours"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mon planning de projets"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Feuille de présence"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Les Dates Limites de mes Tâches"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notes publiques"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tableau de bord de projet"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Pipeline des taches"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mes comptes à facturer"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tableau de bord de gestion de projet"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mes dates limites"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Feuille de présence de l'utilisateur"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tableau du responsable projet"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mes tâches ouvertes"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mon Tableau"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mon tableau de tâches"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Mon pipeline"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Tâches terminées par projet (ce mois)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tâches Fermées par Projet et Utilisateur"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Tâches terminées par projet et par utilisateur (ce mois)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Heures Effectives"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tâches par utilisateur et par projet"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Tâches Fermées"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tâches par Projet"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestion des ventes - Rapports"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tâches par Projet et Utilisateur"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Ce mois"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tâches par projets et utilisateurs"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Delai moy de fermeture"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Tâches par projet"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Moy. Planif-Effect"
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tâches Fermées par Projet"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Reporting"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 3df3a010215..bc9b54e4eaa 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -211,9 +211,7 @@ msgstr ""
 "dodijeljen."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Bilješke"
@@ -229,8 +227,7 @@ msgid "Analysis"
 msgstr "Analiza"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -255,14 +252,12 @@ msgstr ""
 "Automatske varijable za zaglavlje i podnožje. Koristi potpuno istu notaciju."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Poništeno"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Zaglavlje maila."
 
@@ -329,8 +324,7 @@ msgid "Extra Info"
 msgstr "Dodatne informacije"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -411,8 +405,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Računa se kao: Utrošeno vrijeme + Preostalo vrijeme"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tip"
 
@@ -456,8 +449,7 @@ msgid "Planned Time"
 msgstr "Planirano Vrijeme"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Rad u okviru Zadatka"
@@ -510,20 +502,17 @@ msgid "Template"
 msgstr "Predložak"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Početni Datum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekti"
 
@@ -575,20 +564,17 @@ msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Upravljanje Projektima"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Vrijeme Provedeno"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Zadaci"
 
@@ -676,8 +662,7 @@ msgstr "Aktiviraj Račune na osnovi Prodajnih narudžbi"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Nacrt"
 
@@ -692,10 +677,8 @@ msgid "Project Manager"
 msgstr "Voditelj Projekta"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "U toku"
@@ -720,8 +703,7 @@ msgid "Project Time Unit"
 msgstr "Vremenska Jedinica Projekta"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Ime Projekta"
 
@@ -908,10 +890,8 @@ msgstr ""
 "planiranje, analizu prihoda i rashoda, rasporede, itd."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Učinjeno"
@@ -920,8 +900,7 @@ msgstr "Učinjeno"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1103,8 +1082,7 @@ msgid "Template of Projects"
 msgstr "Predložak Projekata"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Slijed"
 
@@ -1168,8 +1146,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegirajte zadatak drugom korisniku."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Podnožje maila"
 
@@ -1178,3 +1155,279 @@ msgstr "Podnožje maila"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Tekući projekti"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Izvršeni zadaci prema Projektu (Ovaj mjesec)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Zadatak zaključen prema Projektu i Korisniku"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Izvršeni Zadaci prema Projektu i Korisniku (Ovaj mjesec)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Efektivni sati"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Zadaci prema Korisniku i Projektu"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Zadatak zaključen"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Zadaci prema Projektu"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Upravljanje Prodajom - Izvještavanje"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Zadaci prema Projektu i Korisniku"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Ovaj mjesec"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Zadaci prema Projektima i Korisnicima"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Prosječno kašnjenje zaključivanja"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Zadaci prema Projektu"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Prosj. Plan.- Efekt."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Zadaci zaključeni prema Projektu"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Zadaci prema Korisniku"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Nema Zadatka"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Izvještaj o Zadacima prema korisniku za projekte"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Raspored / Zadaci u satima po mjesecu"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Tvrtka"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Izvještavanje"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Daje statistike o Zadacima prema Korisniku na projektima radi provjere "
+"slijeda zadataka korisnika."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Zadaci zaključeni u proteklih 15 dana"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Zadatak u satima"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Broj Zadatka"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "report.timesheet.task.user"
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Raspored / Zadaci u satima po mjesecu"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Progres Zadatka"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Izvještaj o zaključenju Zadatka"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Sati Rasporeda"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Zaključeni Zadaci"
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 4950c13eed8..806770e7537 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index c47ea975855..3d53e4fe545 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Bulan Ini"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Pelaporan"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 96bdf09cfc6..3d24e73f00d 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -207,9 +207,7 @@ msgstr ""
 "delegata l'attività."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Note"
@@ -225,8 +223,7 @@ msgid "Analysis"
 msgstr "Analisi"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -252,14 +249,12 @@ msgstr ""
 "stessa notazione."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Annullato"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Titolo Email"
 
@@ -326,8 +321,7 @@ msgid "Extra Info"
 msgstr "Informazioni Aggiuntive"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -406,8 +400,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calcolaro come: Tempo impiegato + Tempo rimanente."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -451,8 +444,7 @@ msgid "Planned Time"
 msgstr "Tempo pianificato"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Esecuzione Attività"
@@ -505,20 +497,17 @@ msgid "Template"
 msgstr "Modello"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configurazione"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Data di inizio"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Progetti"
 
@@ -570,20 +559,17 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Gestione Progetti"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Tempo impiegato"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Attività"
 
@@ -673,8 +659,7 @@ msgstr "Esegui fatturazione per le linee dell'ordine di vendita"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Bozza"
 
@@ -689,10 +674,8 @@ msgid "Project Manager"
 msgstr "Project Manager"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "In sospeso"
@@ -717,8 +700,7 @@ msgid "Project Time Unit"
 msgstr "Unità di tempo del progetto"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nome Progetto"
 
@@ -903,10 +885,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Completato"
@@ -915,8 +895,7 @@ msgstr "Completato"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1096,8 +1075,7 @@ msgid "Template of Projects"
 msgstr "Modello dei Progetti"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
 
@@ -1161,8 +1139,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delega la tua attività ad un altro utente"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Mail Footer"
 
@@ -1171,3 +1148,277 @@ msgstr "Mail Footer"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Progetti Attivi"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "La MIa Pianificazione Progetti"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Orari di Lavoro"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Scadenze delle Mie Attività"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Note Pubbliche"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Dashboard Progetto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Flusso Attività"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "I Miei Conti da Fatturare"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Dashboard Project manager"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Le Mie Scadenze"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Orari di Lavoro dell'Utente"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Dashboard Project Manager"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Le Mie Attività aperte"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "La Mia Scheda"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Scheda Le Mie Attività"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Flusso del Mio Utente"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Attività concluse per progetto (questo mese)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Attività Chiuse per Progetto e Utente"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Attività concluse per progetto e utente (questo mese)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Ore Effettive"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Attività per Utente e Progetto"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Attività Chiusa"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Attività per Progetto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestione vendite - Segnalazione"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Attività per Progetto e Utente"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Questo Mese"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Attività per Progetti e Utenti"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Ritardo Medio di Chiusura"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Attività per Progetto"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Efficienza Media"
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Attività Chiuse per Progetto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Reportistica"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 21e7cc0db09..d29008ef071 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
@@ -73,7 +73,8 @@ msgstr "진행"
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr "총 남은 시간은 과제를 담당한 이에 의해 주기적으로 재 측정될 수 있습니다."
+msgstr ""
+"총 남은 시간은 과제를 담당한 이에 의해 주기적으로 재 측정될 수 있습니다."
 
 #. module: project
 #: field:project.project,child_id:0
@@ -106,7 +107,9 @@ msgstr "위임된 과제들"
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "한 과제가 마감되었을 때 고객에게 전송될 주의 메시지를 위한 이메일의 서두에 추가될 헤더"
+msgstr ""
+"한 과제가 마감되었을 때 고객에게 전송될 주의 메시지를 위한 이메일의 서두에 추"
+"가될 헤더"
 
 #. module: project
 #: field:project.task,priority:0
@@ -202,12 +205,12 @@ msgstr "과제"
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
-msgstr "귀하가 이 과제를 위임한 사용자에 의해 수행된 작업을 검증하는데 필요한 추정 시간"
+msgstr ""
+"귀하가 이 과제를 위임한 사용자에 의해 수행된 작업을 검증하는데 필요한 추정 시"
+"간"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "노트"
@@ -223,8 +226,7 @@ msgid "Analysis"
 msgstr "분석"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -248,14 +250,12 @@ msgid ""
 msgstr "Header와 Footer를 위한 자동 변수. 동일한 노테이션을 사용하십시오."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "취소됨"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "메일 헤더"
 
@@ -284,7 +284,9 @@ msgstr "완료된 작업량으로 계산됨"
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
-msgstr "체크하면, 사용자가 과제를 마감할 때, 고객에게 보낼 이메일 메시지 팝업창이 표시됩니다."
+msgstr ""
+"체크하면, 사용자가 과제를 마감할 때, 고객에게 보낼 이메일 메시지 팝업창이 표"
+"시됩니다."
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
@@ -319,8 +321,7 @@ msgid "Extra Info"
 msgstr "기타 정보"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "파트너"
 
@@ -398,8 +399,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "계산: 소요 시간 + 남은 시간"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "유형"
 
@@ -443,8 +443,7 @@ msgid "Planned Time"
 msgstr "계획된 시간"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "과제 작업"
@@ -495,20 +494,17 @@ msgid "Template"
 msgstr "템플릿"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "구성"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "시작 날짜"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "프로젝트"
 
@@ -560,20 +556,17 @@ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "프로젝트 관리"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "소요된 시간"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "과제들"
 
@@ -661,8 +654,7 @@ msgstr "판매 주문 라인으로부터 인보이스 트리거"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "초안"
 
@@ -677,10 +669,8 @@ msgid "Project Manager"
 msgstr "프로젝트 매니저"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "보류"
@@ -695,7 +685,9 @@ msgstr "상태"
 msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
-msgstr "귀하 자신의 과제의 새 상태. 보류된 과제는 위임된 과제가 마감될 때 자동적으로 다시 오픈합니다."
+msgstr ""
+"귀하 자신의 과제의 새 상태. 보류된 과제는 위임된 과제가 마감될 때 자동적으로 "
+"다시 오픈합니다."
 
 #. module: project
 #: field:res.company,project_time_mode:0
@@ -703,8 +695,7 @@ msgid "Project Time Unit"
 msgstr "프로젝트 시간 단위"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "프로젝트 이름"
 
@@ -743,7 +734,9 @@ msgstr "과제 edition"
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr "계산: 총 시간 - 추정 시간. 프로젝트 매니저에 의해 추정된 시간과 실제 과제 수행 시간 간의 차이."
+msgstr ""
+"계산: 총 시간 - 추정 시간. 프로젝트 매니저에 의해 추정된 시간과 실제 과제 수"
+"행 시간 간의 차이."
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -778,8 +771,8 @@ msgid ""
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
 "프로젝트와 과제에서 사용되는 UoM을 설정합니다. \n"
-"프로젝트에 연결된 타임시트를 이용한다면 (project_timesheet module), 직원들을 위한 적절한 UoM 설정을 잊지 "
-"마십시오."
+"프로젝트에 연결된 타임시트를 이용한다면 (project_timesheet module), 직원들을 "
+"위한 적절한 UoM 설정을 잊지 마십시오."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -821,7 +814,9 @@ msgstr "할당 대상"
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr "과제를 수행하는데 필요한 추정 시간이며, 주로, 해당 과제가 초안 상태일 때 프로젝트 매니저에 의해 설정됩니다."
+msgstr ""
+"과제를 수행하는데 필요한 추정 시간이며, 주로, 해당 과제가 초안 상태일 때 프로"
+"젝트 매니저에 의해 설정됩니다."
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -833,7 +828,9 @@ msgstr "이 프로젝트에 관련된 모든 과제의 소요 시간 합계"
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
-msgstr "프로젝트 이름에 [?]가 포함되면, 이 프로젝트에는 분석 계정이 연결되어 있지 않음을 의미합니다."
+msgstr ""
+"프로젝트 이름에 [?]가 포함되면, 이 프로젝트에는 분석 계정이 연결되어 있지 않"
+"음을 의미합니다."
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -878,14 +875,12 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 "
-"수행할 수 있습니다."
+"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. "
+"예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 수행할 수 있습니다."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "완료"
@@ -894,8 +889,7 @@ msgstr "완료"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1015,7 +1009,8 @@ msgstr "진행 중"
 msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
-msgstr "이름에 [?]이 포함되면, 프로젝트와 분석 계정이 링크되지 않음을 의미합니다."
+msgstr ""
+"이름에 [?]이 포함되면, 프로젝트와 분석 계정이 링크되지 않음을 의미합니다."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
@@ -1032,7 +1027,9 @@ msgstr "프로젝트 과제"
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
-msgstr "이 필드를 체크하면, 프로젝트 매니저는 팀 내에서 과제가 완료될 때마다 요청을 받게 됩니다."
+msgstr ""
+"이 필드를 체크하면, 프로젝트 매니저는 팀 내에서 과제가 완료될 때마다 요청을 "
+"받게 됩니다."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
@@ -1071,8 +1068,7 @@ msgid "Template of Projects"
 msgstr "프로젝트 템플릿"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "시퀀스"
 
@@ -1134,8 +1130,7 @@ msgid "Delegate your task to the other user"
 msgstr "다른 사용자에게 귀하의 과제를 위임"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "메일 Footer"
 
@@ -1145,21 +1140,114 @@ msgstr "메일 Footer"
 msgid "Running projects"
 msgstr "진행 중인 프로젝트"
 
-#, python-format
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "내 프로젝트 계획"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "타임시트"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "내 과제 마감시한"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "공공 노트"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "프로젝트 대시보드"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "프로젝트 사용자 위원회"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "과제 파이프라인"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "내 계획"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "인보이스할 내 계쩡들"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "프로젝트 매니저 대시보드"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "내 마감시한"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "사용자 타임시트"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "프로젝트 매니저 보드"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "내 오픈 과제들"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "내 보드"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "내 과제 보드"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "내 사용자 파이프라인"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "내 타임시트"
+
 #~ msgid "Operation Not Permitted !"
 #~ msgstr "오퍼레이션이 허용되지 않음!"
 
-#, python-format
 #~ msgid "CHECK: "
 #~ msgstr "체크: "
 
-#, python-format
 #~ msgid ""
 #~ "Couldn't send mail because the contact for this task (%s) has no email "
 #~ "address!"
-#~ msgstr "이 과제 접촉자 (%s)의 이메일 주소가 없으므로, 메일을 보낼 수 없습니다!"
+#~ msgstr ""
+#~ "이 과제 접촉자 (%s)의 이메일 주소가 없으므로, 메일을 보낼 수 없습니다!"
 
-#, python-format
 #~ msgid ""
 #~ "A new project has been created !\n"
 #~ "We suggest you to close this one and work on this new project."
@@ -1167,31 +1255,24 @@ msgstr "진행 중인 프로젝트"
 #~ "새 프로젝트가 만들어졌습니다 !\n"
 #~ "이것을 닫고 새 프로젝트에서 작업하십시오."
 
-#, python-format
 #~ msgid "Operation Done"
 #~ msgstr "오퍼레이션 완료"
 
-#, python-format
 #~ msgid "Task '%s' set in progress"
 #~ msgstr "진행 중인 과제 '%s'"
 
-#, python-format
 #~ msgid "Task '%s' cancelled"
 #~ msgstr "과제 '%s' 취소됨"
 
-#, python-format
 #~ msgid "Couldn't send mail because your email address is not configured!"
 #~ msgstr "이메일 주소가 구성되어 있지 않으므로, 메일을 보낼 수 없습니다."
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "에러"
 
-#, python-format
 #~ msgid ""
 #~ "You can not delete a project with tasks. I suggest you to deactivate it."
 #~ msgstr "과제가 있는 프로젝트를 삭제할 수는 없습니다. 비활성화는 가능합니다."
 
-#, python-format
 #~ msgid "Task '%s' closed"
 #~ msgstr "과제 '%s' 완료됨"
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 77812053e24..3f998da3b0e 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Pastabos"
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr "Analizė"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -348,9 +342,10 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Mano projektai"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -394,8 +389,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +433,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +484,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +546,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +644,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +659,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +683,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +856,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +866,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1042,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1104,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1113,99 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index c91e7739a7d..414b0a86ea8 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -212,9 +212,7 @@ msgstr ""
 "door de gebruiker aan wie de taak is gedelegeerd."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Opmerkingen"
@@ -230,8 +228,7 @@ msgid "Analysis"
 msgstr "Analyse"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -257,14 +254,12 @@ msgstr ""
 "schrijfwijze."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Kopregels mail"
 
@@ -331,8 +326,7 @@ msgid "Extra Info"
 msgstr "Extra informatie"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
 
@@ -410,8 +404,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Berekend als: Gebruikte uren + resterende uren."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Soort"
 
@@ -455,8 +448,7 @@ msgid "Planned Time"
 msgstr "Geplande tijd"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Taakwerkzaamheden"
@@ -507,20 +499,17 @@ msgid "Template"
 msgstr "Sjabloon"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Instellingen"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Begindatum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projecten"
 
@@ -572,20 +561,17 @@ msgstr "Ongeldige XML voor weergave!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projectmanagement"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Bestede tijd"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Taken"
 
@@ -673,8 +659,7 @@ msgstr "Trigger facturatie van verkoop-opdracht regels"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Concept"
 
@@ -689,10 +674,8 @@ msgid "Project Manager"
 msgstr "Projectleider"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Wachtend"
@@ -717,8 +700,7 @@ msgid "Project Time Unit"
 msgstr "Tijdseenheid project"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Naam project"
 
@@ -847,8 +829,7 @@ msgstr ""
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Totaal van gebruikte uren van alle taken gerelateerd aan dit project."
+msgstr "Totaal van gebruikte uren van alle taken gerelateerd aan dit project."
 
 #. module: project
 #: help:project.task,project_id:0
@@ -909,10 +890,8 @@ msgstr ""
 "verbinden."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Voltooid"
@@ -921,8 +900,7 @@ msgstr "Voltooid"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1103,8 +1081,7 @@ msgid "Template of Projects"
 msgstr "Projectsjabloon"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Reeks"
 
@@ -1168,8 +1145,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegeer deze taak aan een andere gebruiker"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Mail voetregels"
 
@@ -1178,3 +1154,279 @@ msgstr "Mail voetregels"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Lopende projecten"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mijn projectplanning"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Urenstaten"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mijn taken-deadlines"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Publieke berichten"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Project dashboard"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Dashboard voor projectleden"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Aankomende taken"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Mijn planning"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mijn declaratierekeningen"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Projectleider dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mijn deadlines"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Urenstaten gebruikers"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Projectleider dashboard"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mijn openstaande taken"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mijn dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mijn taken-dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Mijn verwachte taken"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mijn urenstaat"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Afgeronde taken per project (deze maand)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Gesloten taken per project en gebruiker"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Afgeronde taken per project en gebruiker (deze maand)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Effectieve uren"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Taken per gebruiker en project"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Taak gesloten"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Taken per project"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Verkoopbeheer - Overzichten"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Taken per project en gebruiker"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Deze maand"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Taken per project en gebruiker"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Gem. afsluitvertraging"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Taken per project"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Gem. Plan.-Eff."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Afgesloten taken per project"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Taken per gebruiker"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Geen taak"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Overzicht taken per gebruiker voor projecten"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Urenstaat / Taakuren per maand"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Overzichten"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Geeft statistieken op taken per gebruiker op projecten om de pijplijn van "
+"gebruikers te controleren."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Gesloten taken van de afgelopen 15 dagen"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Uren taak"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Taaknummer"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "report.timesheet.task.user"
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Overzicht urenstaat / taakuren per maand"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Voortgang taak"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Overzicht gesloten taken"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Uren urenstaat"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Gesloten taken"
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index 5eed7107407..9f6ffbb6501 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1063,8 +1042,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1126,8 +1104,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1136,3 +1113,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index 54e4aa93b07..26aef15d8e3 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -208,9 +208,7 @@ msgstr ""
 "przydzieliłeś to zadanie."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Uwagi"
@@ -226,8 +224,7 @@ msgid "Analysis"
 msgstr "Analiza"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -252,14 +249,12 @@ msgstr ""
 "Automatyczne zmienne dla nagłówka i stopki. Stosuj dokładnie tę samą notację."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Magłówke wiadomości"
 
@@ -323,8 +318,7 @@ msgid "Extra Info"
 msgstr "Dodatkowe informacje"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -402,8 +396,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Typ"
 
@@ -447,8 +440,7 @@ msgid "Planned Time"
 msgstr "Czas planowany"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Przebieg zadania"
@@ -500,20 +492,17 @@ msgid "Template"
 msgstr "Szablon"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Data rozpoczęcia"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekty"
 
@@ -565,20 +554,17 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projekty"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Spędzony czas"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -666,8 +652,7 @@ msgstr "Twórz faktury z pozycji zamówienia sprzedaży"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Projekt"
 
@@ -682,10 +667,8 @@ msgid "Project Manager"
 msgstr "Menedżer projektu"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Oczekiwanie"
@@ -710,8 +693,7 @@ msgid "Project Time Unit"
 msgstr "Jednostka czasu w projekcie"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nazwa projektu"
 
@@ -898,10 +880,8 @@ msgstr ""
 "kosztów i przychodów, kartami czasu pracy itp."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Wykonano"
@@ -910,8 +890,7 @@ msgstr "Wykonano"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1093,8 +1072,7 @@ msgid "Template of Projects"
 msgstr "Szablon projektów"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
@@ -1158,8 +1136,7 @@ msgid "Delegate your task to the other user"
 msgstr "Przydziel swoje zadania innemu użytkownikowi"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Stopka wiadomości"
 
@@ -1168,3 +1145,279 @@ msgstr "Stopka wiadomości"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Bieżące projekty"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Planowanie mojego projektu"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Karty czasu pracy"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Moje terminy"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Uwagi ogólne"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Konsola projektu"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Konsola dla użytkowników projektu"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Przepływ zadań"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Moje planowania"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Moje konta do fakturowania"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Konsola Menedżera projektów"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Moje terminy"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Karty czasu pracy użytkownika"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Konsola Menedżera projektu"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Moje otwarte zadania"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Moja konsola"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Konsola moich zadań"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Moje przepływy zadań"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Moja karta czasu pracy"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "Zadania zakończone wg projektów (ten miesiąc)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Zadania zamknięte wg projektu i użytkownika"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Zakończone zadania wg projektu i użytkownika (ten miesiąc)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Efektywne godziny"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Zadania wg użytkownika i projektu"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Zadania zamknięte"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Zadania wg projektu"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Sprzedaż - Raportowanie"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Zadania wg projektu i użytkownika"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "W tym miesiącu"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Zadania wg projektów i użytkowników"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Śred. opóźnienie"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Zadania wg projektu"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Śred. Efekt. Plan."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Zamknięte zadania wg projektu"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Zadania wg użytkownika"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Brak zadań"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Raport zadań wg użytkowników"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Karta czasu pracy / Czasy zadań na miesiąc"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Raportowanie"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Pokaże statystykę zadań wg użytkownika na projekt do sprawdzania przepływu "
+"użytkownika."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Zadania zamknięte w ostatnich 15stu dniach"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Godziny zadania"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Numer zadania"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Raport godzin kart/zadań wg miesięcy"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Postęp zadania"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Raport zamkniętych zadań"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Godziny karty czasu pracy"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Zadania zamknięte"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index f46fd3182d7..23e495c0361 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1103,4 +1103,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
 
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index cf5fe168fb0..91a02c30b94 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -211,9 +211,7 @@ msgstr ""
 "delegou esta tarefa."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -229,8 +227,7 @@ msgid "Analysis"
 msgstr "Análise"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -256,14 +253,12 @@ msgstr ""
 "notação."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Cabeçalho da mensagem"
 
@@ -329,8 +324,7 @@ msgid "Extra Info"
 msgstr "Informação extra"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
@@ -410,8 +404,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Calculado como: Tempo dispendido + tempo restante"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -455,8 +448,7 @@ msgid "Planned Time"
 msgstr "Tempo planeado"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Trabalho da tarefa"
@@ -507,20 +499,17 @@ msgid "Template"
 msgstr "Modelo"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuração"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Data Inicial"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projectos"
 
@@ -572,20 +561,17 @@ msgstr "XML inválido para a arquitectura da vista"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Gestão de Projectos"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Tempo despendido"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -673,8 +659,7 @@ msgstr "Despoletar facturas desde as linhas da ordem de venda"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
@@ -689,10 +674,8 @@ msgid "Project Manager"
 msgstr "Gestor do projecto"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Pendente"
@@ -717,8 +700,7 @@ msgid "Project Time Unit"
 msgstr "Unidade de tempo do projecto"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nome do projecto"
 
@@ -902,10 +884,8 @@ msgstr ""
 "análise de custos e de receitas, calendário de projectos, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Concluído"
@@ -914,8 +894,7 @@ msgstr "Concluído"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1097,8 +1076,7 @@ msgid "Template of Projects"
 msgstr "Modelo de projectos"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
@@ -1162,8 +1140,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegue a sua tarefa ao outro utilizador"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Rodapé do mensagem"
 
@@ -1172,3 +1149,277 @@ msgstr "Rodapé do mensagem"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Projectos em curso"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Meus planeamentos de projectos"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Horários"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Meus prazos das tarefas"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Notas públicas"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Painel de projecto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Encanamento de tarefas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Minhas contas a facturar"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Painel de administração de projecto"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Meus prazos"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Folha de presença do utilizador"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Quadro de gestão de projecto"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Minhas tarefas abertas"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Meu quadro"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Meu quadro de tarefas"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Fila do meu utilizador"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tarefas fechados por projecto e utilizador"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Horas efectivas"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tarefas por utilizador e projecto"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Tarefa fechado"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tarefas por projecto"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Utilizador"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tarefas por projecto e utilizador"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Este mês"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tarefas por projectos e utilizadores"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Avg atraso do fecho"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "tarefas por projectos"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Avg. Plan.-Eff."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tarefas fechadas por projecto"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Relatório"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index eb3cf17a23e..d22db52458b 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # translation of pt_BR.po to
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -212,9 +212,7 @@ msgstr ""
 "foi delegada esta tarefa."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Observações"
@@ -230,8 +228,7 @@ msgid "Analysis"
 msgstr "Análise"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -257,14 +254,12 @@ msgstr ""
 "notação."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Cabeçalho de Correspondência"
 
@@ -330,8 +325,7 @@ msgid "Extra Info"
 msgstr "Informações Adicionais"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
@@ -412,8 +406,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Computado como: Tempo Gasto + Tempo Restante"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -457,8 +450,7 @@ msgid "Planned Time"
 msgstr "Tempo Planejado"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Tarefas realizadas"
@@ -509,20 +501,17 @@ msgid "Template"
 msgstr "Modelo"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Configuração"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Data de Início"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projetos"
 
@@ -574,20 +563,17 @@ msgstr "Invalido XML para Arquitetura da View"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Gerência de Projeto"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Tempo Gasto"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -676,8 +662,7 @@ msgstr "Disparar faturas a partir os itens da ordem de venda"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
@@ -692,10 +677,8 @@ msgid "Project Manager"
 msgstr "Gerente do Projeto"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Pendente"
@@ -720,8 +703,7 @@ msgid "Project Time Unit"
 msgstr "Unidade de Tempo do Projeto"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Nome do Projeto"
 
@@ -848,8 +830,7 @@ msgstr ""
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
-"Soma das horas gastas em todas as tarefas relacionadas a este projeto"
+msgstr "Soma das horas gastas em todas as tarefas relacionadas a este projeto"
 
 #. module: project
 #: help:project.task,project_id:0
@@ -863,8 +844,7 @@ msgstr ""
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
-"Soma das horas planejadas para as tarefas relacionadas a este projeto"
+msgstr "Soma das horas planejadas para as tarefas relacionadas a este projeto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -909,10 +889,8 @@ msgstr ""
 "planilha de tempo em projetos, etc."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Concluído"
@@ -921,8 +899,7 @@ msgstr "Concluído"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1104,8 +1081,7 @@ msgid "Template of Projects"
 msgstr "Modelo de Projetos"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Seqüência"
 
@@ -1169,8 +1145,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegar sua tarefa para outro usuário"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Rodapé de Correspondëncia"
 
@@ -1179,3 +1154,277 @@ msgstr "Rodapé de Correspondëncia"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Projetos em execução"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. project.
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. project.
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. project.
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. project.
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. project.
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. project.
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. project.
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. project.
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. project.
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. project.
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. project.
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Este mes"
+
+#. project.
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. project.
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. project.
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. project.
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. project.
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. project.
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Relatórios"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 4950c13eed8..806770e7537 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index c06e6298e50..74ed7f47706 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -207,9 +207,7 @@ msgstr ""
 "выполненной пользователем, которому было поручено это задание."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Записи"
@@ -225,8 +223,7 @@ msgid "Analysis"
 msgstr "Анализ"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -252,14 +249,12 @@ msgstr ""
 "самое написание."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Заголовок письма"
 
@@ -326,8 +321,7 @@ msgid "Extra Info"
 msgstr "Доп. информация"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
@@ -408,8 +402,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Тип"
 
@@ -453,8 +446,7 @@ msgid "Planned Time"
 msgstr "Запланированное время"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Работа по заданию"
@@ -507,20 +499,17 @@ msgid "Template"
 msgstr "Шаблон"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Конфигурация"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Дата начала"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Проекты"
 
@@ -572,20 +561,17 @@ msgstr "Неправильный XML для просмотра архитект
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Управление проектами"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Затраченное время"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Задания"
 
@@ -673,8 +659,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Черновик"
 
@@ -689,10 +674,8 @@ msgid "Project Manager"
 msgstr "Руководитель проекта"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "В ожидании"
@@ -715,8 +698,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Наименование проекта"
 
@@ -902,10 +884,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Выполнено"
@@ -914,8 +894,7 @@ msgstr "Выполнено"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1097,8 +1076,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Последовательность"
 
@@ -1162,8 +1140,7 @@ msgid "Delegate your task to the other user"
 msgstr "Поручить ваше задание другому пользователю"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Нижняя часть письма"
 
@@ -1172,3 +1149,277 @@ msgstr "Нижняя часть письма"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Запущенные проекты"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Мои планируемые проекты"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Табели"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Мои сроки заданий"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Общедоступные примечания"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Панель аналитики проекта"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Панель для пользователей проекта"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Конвейер заданий"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Мой план"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Мои счета к выставлению"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Паналь аналитики руководителя проекта"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Мои сроки"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Табели пользователей"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Панель руководителя проекта"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Мои открытые задания"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Моя панель"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Моя панель заданий"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Мои конвейеры пользователей"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Мой табель"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Закрытые задания по проектам и пользователям"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Эффективных часов"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Задания по пользователям и проектам"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "Закрытое задание"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Задания по проектам"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Задания по проектам и пользователям"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Данный месяц"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Задания по проектам и пользоватлеям"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Ср. задержка закрытия"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "Задания по проектам"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Ср. план.-эфф."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Закрытые задания по проектам"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Отчетность"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index d48a25fcc7c..c5c6dfeee55 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Opombe"
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr "Analiza"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Preklicano"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr "Dodatne informacije"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tip"
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Delo na nalogi"
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr "Predloga"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Začetni datum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekti"
 
@@ -556,20 +545,17 @@ msgstr "Neveljaven XML za arhitekturo pogleda."
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Upravljanje projektov"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Porabljeni čas"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Opravila"
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Osnutek"
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr "Vodja projekta"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Čakajoči"
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Ime projekta"
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Zaključeno"
@@ -885,8 +865,7 @@ msgstr "Zaključeno"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1063,8 +1042,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Zaporedje"
 
@@ -1126,8 +1104,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1136,3 +1113,279 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Časovnice"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Moje načrtovanje"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Moje odprte naloge"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Moja časovnica"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Naloge po uporabnikih in projektih"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Naloge po uporabniku"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Brez naloge"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Poročilo po nalogah po uporabnikih za projekte"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Ure na mesec po časovnici/nalogi"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Poročanje"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Prikaže statistiko nalog po uporabnikih na projektih za preverjanje čakalne "
+"vrste po uporabnikih."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Naloge zaprte v zadnjih 15-ih dnevih"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Ure po nalogi"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Številka naloge"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr "report.timesheet.task.user"
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Poročilo o urah na mesec po časovnici/nalogi"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Napredek opravila"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Poročilo o zaključenih nalogah"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Ure po časovnici"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Zaključene naloge"
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 049389484c8..5f4f99b7ba3 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -211,9 +211,7 @@ msgstr ""
 "som du delegerade denna uppgift."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Anteckningar"
@@ -229,8 +227,7 @@ msgid "Analysis"
 msgstr "Analys"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -255,14 +252,12 @@ msgstr ""
 "Automatiska variabler för sidhuvud och sidfot. Använd exakt samma notation."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Avbruten"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "Epost huvud"
 
@@ -328,8 +323,7 @@ msgid "Extra Info"
 msgstr "Tilläggsinformation"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Företag"
 
@@ -407,8 +401,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "Beräknas som: Nedlagd tid + Återstående tid."
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Typ"
 
@@ -452,8 +445,7 @@ msgid "Planned Time"
 msgstr "Planerade timmar"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Aktivitetsarbete"
@@ -505,20 +497,17 @@ msgid "Template"
 msgstr "Mall"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Startdatum"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projekt"
 
@@ -570,20 +559,17 @@ msgstr "Ogiltig XML för Vy-arkitektur!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Projekt"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Nedlagd tid"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Aktiviteter"
 
@@ -671,8 +657,7 @@ msgstr "Utlös faktura från försäljningsorderrader"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Preliminär"
 
@@ -687,10 +672,8 @@ msgid "Project Manager"
 msgstr "Projektledare"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Väntande"
@@ -715,8 +698,7 @@ msgid "Project Time Unit"
 msgstr "Projektets tidsenhet"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Projektnamn"
 
@@ -904,10 +886,8 @@ msgstr ""
 "visa en resultaträkning för projektet, visa tidrapporter för projektet osv."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Klar"
@@ -916,8 +896,7 @@ msgstr "Klar"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1098,8 +1077,7 @@ msgid "Template of Projects"
 msgstr "Projektmallar"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Sekvens"
 
@@ -1163,8 +1141,7 @@ msgid "Delegate your task to the other user"
 msgstr "Delegera din aktivitet till den andra användaren"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "Epost fot"
 
@@ -1173,3 +1150,280 @@ msgstr "Epost fot"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Pågående projekt"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mina projekts planering"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0 model:ir.actions.act_window,name:module:
+#: projectact_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Tidrapporter"
+
+#. module: project
+#: model:ir.actions.act_window,name:module:
+#: projectaction_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Mina aktiviteters deadlines"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:module:
+#: projectaction_view_board_note_tree
+msgid "Public Notes"
+msgstr "Publika Inlägg"
+
+#. module: project
+#: model:ir.actions.act_window,name:module: projectopen_board_project
+#: model:ir.ui.menu,name:module: projectmenu_board_project
+msgid "Project Dashboard"
+msgstr "Projekt dashboard"
+
+#. module: project
+#: model:ir.module.module,shortdesc:module: projectmodule_meta_information
+msgid "Board for project users"
+msgstr "Dashboard för projektanvändare"
+
+#. module: project
+#: model:ir.actions.act_window,name:module:
+#: projectaction_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Aktiviteter i pipeline"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Min planering"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:module:
+#: projectact_my_account
+msgid "My accounts to invoice"
+msgstr "Mina konton som skall fakturerar"
+
+#. module: project
+#: model:ir.actions.act_window,name:module: projectopen_board_project_manager
+#: model:ir.ui.menu,name:module: projectmenu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Projektledare dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mina deadlines"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Användares tidrapporter"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Projektledarens dashboard"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:module:
+#: projectaction_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mina öppna aktiviteter"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Min dashboard"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Dashboard för mina aktiviteter"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Mina användares pipeline"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Min tidrapport"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 427c1a403ce..7b7efaf0667 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr ""
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr ""
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +545,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr ""
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +865,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1041,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1103,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1112,99 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index a86e22c61ca..c9f699956a3 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -211,9 +211,7 @@ msgstr ""
 "ihtiyacınız olan tahmini süre."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Notlar"
@@ -229,8 +227,7 @@ msgid "Analysis"
 msgstr "Tahlil"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -256,14 +253,12 @@ msgstr ""
 "biçimini kullanın."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "İptal Edilmiş"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "E-Posta Başlığı"
 
@@ -329,8 +324,7 @@ msgid "Extra Info"
 msgstr "İlave Bilgi"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "Ortak"
 
@@ -409,8 +403,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Tür"
 
@@ -454,8 +447,7 @@ msgid "Planned Time"
 msgstr "Planlanan Süre"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Görev İşi"
@@ -506,20 +498,17 @@ msgid "Template"
 msgstr "Şablon"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Ayarlar"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "Başlangıç Tarihi"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Projeler"
 
@@ -571,20 +560,17 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Proje Yönetimi"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "Harcanan Zaman"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Görevler"
 
@@ -672,8 +658,7 @@ msgstr "Satış Emri satırlarından fatura tetikle."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Taslak"
 
@@ -688,10 +673,8 @@ msgid "Project Manager"
 msgstr "Proje Yöneticisi"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "Askıda"
@@ -716,8 +699,7 @@ msgid "Project Time Unit"
 msgstr "Proje Zaman Birimi"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "Proje Adı"
 
@@ -892,10 +874,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Tamamlandı"
@@ -904,8 +884,7 @@ msgstr "Tamamlandı"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1081,8 +1060,7 @@ msgid "Template of Projects"
 msgstr "Projeler Şablonu"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Silsile"
 
@@ -1144,8 +1122,7 @@ msgid "Delegate your task to the other user"
 msgstr "Görevinizi başka bir kullanıcıya aktarın."
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "E-Posta Alt Bilgisi"
 
@@ -1154,3 +1131,277 @@ msgstr "E-Posta Alt Bilgisi"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Süren Projeler"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Proje Planlamam"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Saat girişleri"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Görevlerimin Bitiş Tarihleri"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Genel İletiler"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Proje Panosu"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "Proje kullanıcıları masası"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Görev gidişatı"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Planlamam"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Hesaplarımdan faturaya"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Proje Yöteticisi alanı"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Benim Bitirme tarihlerim"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Kullanıcının Zaman Çizelgesi"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Proje Yöneticileri"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Açık Görevler"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Karatahtam"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Görevlerimin panosu"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Kullanıcımın proje önerisi"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Zaman çizelgem"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Satış Yönetimi - Raporlama"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Kullanıcı"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Bu Ay"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "Ort. Kapanış Gecikmesi"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Ort. Plan.-Eff."
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Kullanıcı Bazında Görevler"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "Görev Yok"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Raporlama"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Görev Saati"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Görev Sayısı"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Görev Süreci"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Kapanan Görev Raporu"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Kapanan Görev"
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 7ededd3f759..2ed7085e887 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "Примітки"
@@ -219,8 +217,7 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -244,14 +241,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "Скасований"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +310,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +388,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "Тип"
 
@@ -439,8 +432,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "Робота завдання"
@@ -491,20 +483,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "Налаштування"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "Проекти"
 
@@ -556,20 +545,17 @@ msgstr "Неправильний XML для Архітектури Вигляд
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "Проекти"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "Завдання"
 
@@ -657,8 +643,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "Чорновик"
 
@@ -673,10 +658,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "В очікуванні"
@@ -699,8 +682,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +855,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "Завершений"
@@ -885,8 +865,7 @@ msgstr "Завершений"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1063,8 +1042,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "Послідовність"
 
@@ -1126,8 +1104,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1136,3 +1113,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Моє планування проектів"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Табелі"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Панель проекту"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Діаграма завдань"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Мої рахунки до виписки"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Панель Менеджера Проекту"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Табелі користувача"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Панель менеджера проектів"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Мої відкриті завдання"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Моя панель завдань"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Канали мого користувача"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "Цей місяць"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "Звіти"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 38b3733dac5..91285c591a3 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -203,9 +203,7 @@ msgid ""
 msgstr "确认你向谁委派这任务完成的估计时间"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "备注"
@@ -221,8 +219,7 @@ msgid "Analysis"
 msgstr "分析"
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
+#: model:ir.model,name:project.model_project_project view:project.project:0
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
@@ -246,14 +243,12 @@ msgid ""
 msgstr "页眉页脚的自动变量.使用同一个符号."
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr "邮件头"
 
@@ -317,8 +312,7 @@ msgid "Extra Info"
 msgstr "额外信息"
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
 
@@ -396,8 +390,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr "计算:花费的时间 + 剩余的时间"
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "类型"
 
@@ -441,8 +434,7 @@ msgid "Planned Time"
 msgstr "已计划的时间"
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr "任务工作"
@@ -493,20 +485,17 @@ msgid "Template"
 msgstr "模板"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr "设置"
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr "开始日期"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr "项目"
 
@@ -558,20 +547,17 @@ msgstr "无效的视图结构xml文件"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr "项目管理"
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr "花费的时间"
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "任务"
 
@@ -659,8 +645,7 @@ msgstr "销售订单明细触发的发票"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr "草稿"
 
@@ -675,10 +660,8 @@ msgid "Project Manager"
 msgstr "项目管理"
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr "未决"
@@ -701,8 +684,7 @@ msgid "Project Time Unit"
 msgstr "项目时间单位"
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr "项目名称"
 
@@ -741,7 +723,8 @@ msgstr "任务编辑"
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr "计算:总时间 - 估计时间.它提供给项目经理时间估计和任务实际的关闭时间之间的差距"
+msgstr ""
+"计算:总时间 - 估计时间.它提供给项目经理时间估计和任务实际的关闭时间之间的差距"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -774,7 +757,9 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr "这将设置项目和任务的计量单位如果你使用链接的时间表不要忘记设置你员工的计量单位"
+msgstr ""
+"这将设置项目和任务的计量单位如果你使用链接的时间表不要忘记设置你员工的计量单"
+"位"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -872,13 +857,13 @@ msgid ""
 "Link this project to an analytic account if you need financial management on "
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
-msgstr "如果你需要项目的财务管理链接到这项目的辅助核算项目行,它能让你在链接的项目的有预算、计划、成本和收益分析、项目的时间表等."
+msgstr ""
+"如果你需要项目的财务管理链接到这项目的辅助核算项目行,它能让你在链接的项目的有"
+"预算、计划、成本和收益分析、项目的时间表等."
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr "完成"
@@ -887,8 +872,7 @@ msgstr "完成"
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1064,8 +1048,7 @@ msgid "Template of Projects"
 msgstr "项目模板"
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr "序列"
 
@@ -1127,8 +1110,7 @@ msgid "Delegate your task to the other user"
 msgstr "委派你的任务给其它用户"
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr "邮件页脚"
 
@@ -1137,3 +1119,299 @@ msgstr "邮件页脚"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "运行项目"
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "我的项目计划"
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "时间表"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "我的任务最后期限"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "公开备注"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "项目控制台"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr "用户项目面板"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "任务管线"
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "我的计划"
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "我的发票科目"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "项目管理控制台"
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "我的最后期限"
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "用户时间表"
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "项目管理控制台"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "我的未结任务"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "我的面板"
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "我的任务面板"
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "我用户的管线"
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "我的时间表"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr "项目的完成的任务(这月)"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "项目和用户关闭的任务"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "项目和用户完成的任务(这月)"
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "有效时间"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "项目和用户的任务"
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr "任务关闭"
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "项目的任务"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "销售管理 - 报表"
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "项目和用户的任务"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr "本月"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "项目和用户的任务"
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr "平均关闭延迟"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr "项目任务"
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr "月"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "项目关闭的任务"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "用户任务"
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "没任务"
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "项目用户任务报表"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "时间表/每月任务小时数"
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr "内部报表"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr "项目用户任务的统计来检查用户的管线"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "15天前关闭的任务"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "任务的小时数"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "任务数"
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "时间表/每月任务小时数报表"
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "任务进度"
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "关闭任务报表"
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "时间表小时数"
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "关闭任务"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for project member that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * List of my next deadlines\n"
+#~ "    * List of public notes\n"
+#~ "    * Graph of my timesheet\n"
+#~ "    * Graph of my work analysis\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现项目的控制台包括:\n"
+#~ "    *我打开的任务列表\n"
+#~ "    *我的下一最后期限列表\n"
+#~ "    *公开备注列表\n"
+#~ "    *我的时间表图表\n"
+#~ "    *我的工作分析图形\n"
+#~ "    "
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index 5bffe0f2dd0..fa892d75332 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
+# 	* project
 #
 msgid ""
 msgstr ""
@@ -201,9 +201,7 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,notes:0
-#: view:project.task:0
+#: view:project.project:0 field:project.project,notes:0 view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
 msgstr "注释"
@@ -219,12 +217,9 @@ msgid "Analysis"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_project
-#: view:project.project:0
-#: field:project.task,project_id:0
-#: model:res.request.link,name:project.req_link_project
+#: model:ir.ui.menu,name:project.next_id_86
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: project
 #: view:project.task:0
@@ -244,14 +239,12 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: selection:project.project,state:0
-#: selection:project.task,state:0
+#: selection:project.project,state:0 selection:project.task,state:0
 msgid "Cancelled"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_header:0
+#: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
 msgstr ""
 
@@ -315,8 +308,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project
-#: field:project.project,partner_id:0
-#: field:project.task,partner_id:0
+#: field:project.project,partner_id:0 field:project.task,partner_id:0
 msgid "Partner"
 msgstr ""
 
@@ -394,8 +386,7 @@ msgid "Computed as: Time Spent + Remaining Time."
 msgstr ""
 
 #. module: project
-#: field:project.task,type:0
-#: field:project.task.type,name:0
+#: field:project.task,type:0 field:project.task.type,name:0
 msgid "Type"
 msgstr "类型"
 
@@ -439,8 +430,7 @@ msgid "Planned Time"
 msgstr ""
 
 #. module: project
-#: model:ir.model,name:project.model_project_task_work
-#: view:project.task:0
+#: model:ir.model,name:project.model_project_task_work view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
 msgstr ""
@@ -491,20 +481,17 @@ msgid "Template"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_definitions
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
 msgstr ""
 
 #. module: project
-#: field:project.project,date_start:0
-#: field:project.task,date_start:0
+#: field:project.project,date_start:0 field:project.task,date_start:0
 msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_all_project
-#: view:project.project:0
+#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0
 msgid "Projects"
 msgstr ""
 
@@ -556,20 +543,17 @@ msgstr ""
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
-#: model:ir.ui.menu,name:project.menu_main
-#: view:res.company:0
+#: model:ir.ui.menu,name:project.menu_main view:res.company:0
 msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.project,effective_hours:0
-#: field:project.task.work,hours:0
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
 msgstr ""
 
 #. module: project
-#: model:ir.ui.menu,name:project.menu_tasks
-#: view:project.task:0
+#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0
 msgid "Tasks"
 msgstr "任务"
 
@@ -657,8 +641,7 @@ msgstr ""
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.task:0 selection:project.task,state:0
 msgid "Draft"
 msgstr ""
 
@@ -673,10 +656,8 @@ msgid "Project Manager"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
 msgstr ""
@@ -699,8 +680,7 @@ msgid "Project Time Unit"
 msgstr ""
 
 #. module: project
-#: field:project.project,complete_name:0
-#: field:project.project,name:0
+#: field:project.project,complete_name:0 field:project.project,name:0
 msgid "Project Name"
 msgstr ""
 
@@ -873,10 +853,8 @@ msgid ""
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: selection:project.project,state:0
-#: view:project.task:0
-#: selection:project.task,state:0
+#: view:project.project:0 selection:project.project,state:0
+#: view:project.task:0 selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
 msgstr ""
@@ -885,8 +863,7 @@ msgstr ""
 #: view:config.compute.remaining:0
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
-#: view:project.project:0
-#: view:project.task:0
+#: view:project.project:0 view:project.task:0
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
@@ -1062,8 +1039,7 @@ msgid "Template of Projects"
 msgstr ""
 
 #. module: project
-#: field:project.project,priority:0
-#: field:project.task,sequence:0
+#: field:project.project,priority:0 field:project.task,sequence:0
 msgid "Sequence"
 msgstr ""
 
@@ -1125,8 +1101,7 @@ msgid "Delegate your task to the other user"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-#: field:project.project,warn_footer:0
+#: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
 
@@ -1135,3 +1110,277 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project/installer.py b/addons/project/installer.py
index dd18a2937a2..e35e1b72a6c 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -26,29 +26,29 @@ class project_installer(osv.osv_memory):
 
     _columns = {
         # Project Management
-        'project_long_term':fields.boolean('Long Term Planning',
+        'project_long_term': fields.boolean('Long Term Planning',
             help="Enables long-term projects tracking, including "
                  "multiple-phase projects and resource allocation handling."),
-        'project_wiki':fields.boolean('Specifications in a Wiki',
+        'project_wiki': fields.boolean('Specifications in a Wiki',
             help=""),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
+        'hr_timesheet_sheet': fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendance."),
-        'hr_timesheet_invoice':fields.boolean('Invoice Based on Hours',
+        'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
             help="Helps generate invoice based on based on human resources "
                  "costs and general expenses."),
-        'account_budget':fields.boolean('Budgets',
+        'account_budget': fields.boolean('Budgets',
             help="Helps accountants manage analytic and crossover budgets."),
-        'project_messages':fields.boolean('Project Messages',
+        'project_messages': fields.boolean('Project Messages',
             help="Lets employees send messages to other members of the "
                  "projects they're working on."),
-        'project_crm':fields.boolean('Issues Tracker',
+        'project_crm': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
-        'scrum':fields.boolean('SCRUM',
+        'scrum': fields.boolean('SCRUM',
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
-        'project_gtd':fields.boolean('Getting Things Done',
+        'project_gtd': fields.boolean('Getting Things Done',
             help="Embeds the Getting Things Done concepts into OpenERP's "
                  "project management."),
         }
@@ -56,3 +56,5 @@ class project_installer(osv.osv_memory):
              'project_crm': True,
                }
 project_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project.py b/addons/project/project.py
index c5c389e5510..169a2043b20 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 from lxml import etree
-import mx.DateTime
 import datetime
 import time
 
@@ -37,7 +36,7 @@ class project_task_type(osv.osv):
     _order = 'sequence'
 
     _defaults = {
-        'sequence': lambda *args: 1
+        'sequence': 1
     }
 project_task_type()
 
@@ -61,7 +60,9 @@ class project(osv.osv):
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def _complete_name(self, cr, uid, ids, name, args, context={}):
+    def _complete_name(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
             res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name
@@ -71,7 +72,9 @@ class project(osv.osv):
         return super(project, self).check_recursion(cursor, user, ids,
                 parent=parent)
 
-    def onchange_partner_id(self, cr, uid, ids, part, context={}):
+    def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+        if context is None:
+            context = {}
         partner_obj = self.pool.get('res.partner')
         if not part:
             return {'value':{'contact_id': False, 'pricelist_id': False}}
@@ -80,7 +83,9 @@ class project(osv.osv):
         pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
 
-    def _progress_rate(self, cr, uid, ids, names, arg, context={}):
+    def _progress_rate(self, cr, uid, ids, names, arg, context=None):
+        if context is None:
+            context = {}
         res = {}.fromkeys(ids, 0.0)
         progress = {}
         if not ids:
@@ -118,11 +123,12 @@ class project(osv.osv):
             if proj.tasks:
                 raise osv.except_osv(_('Operation Not Permitted !'), _('You can not delete a project with tasks. I suggest you to deactivate it.'))
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
+
     _columns = {
         'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
-        'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
+        'category_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."),
@@ -135,17 +141,17 @@ class project(osv.osv):
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'),
-        'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'),
+        'project_escalation_id': fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'),
      }
     _order = "sequence"
     _defaults = {
-        'active': lambda *a: True,
-        'priority': lambda *a: 1,
-        'sequence': lambda *a: 10,
-        'warn_manager': lambda *a: True,
+        'active': True,
+        'priority': 1,
+        'sequence': 10,
+        'warn_manager': True,
     }
     def _check_dates(self, cr, uid, ids):
-         leave = self.read(cr, uid, ids[0],['date_start','date'])
+         leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
          if leave['date_start'] and leave['date']:
              if leave['date_start'] > leave['date']:
                  return False
@@ -162,31 +168,33 @@ class project(osv.osv):
         (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']),
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
-    def set_template(self, cr, uid, ids, context={}):
+    def set_template(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=False, context=context)
         return res
 
-    def set_done(self, cr, uid, ids, context={}):
+    def set_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'close'}, context=context)
         return True
 
-    def set_cancel(self, cr, uid, ids, context={}):
+    def set_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
         return True
 
-    def set_pending(self, cr, uid, ids, context={}):
+    def set_pending(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
-    def set_open(self, cr, uid, ids, context={}):
+    def set_open(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         return True
 
-    def reset_project(self, cr, uid, ids, context={}):
-        res = self.setActive(cr, uid, ids,value=True, context=context)
+    def reset_project(self, cr, uid, ids, context=None):
+        res = self.setActive(cr, uid, ids, value=True, context=context)
         return res
 
-    def copy(self, cr, uid, id, default={}, context={}):
+    def copy(self, cr, uid, id, default={}, context=None):
+        if context is None:
+            context = {}
         proj = self.browse(cr, uid, id, context=context)
         default = default or {}
         context['active_test'] = False
@@ -199,13 +207,16 @@ class project(osv.osv):
             cr.execute('update project_task set active=True where project_id IN %s',(tuple(ids),))
         return res
 
-    def duplicate_template(self, cr, uid, ids, context={}):
+    def duplicate_template(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         project_obj = self.pool.get('project.project')
         data_obj = self.pool.get('ir.model.data')
         task_obj = self.pool.get('project.task')
         result = []
         for proj in self.browse(cr, uid, ids, context=context):
-            parent_id = context.get('parent_id',False) # check me where to pass context for parent id ??
+            parent_id = context.get('parent_id', False) # check me where to pass context for parent id ??
+            context.update({'analytic_project_copy': True})
             new_id = project_obj.copy(cr, uid, proj.id, default = {
                                     'name': proj.name +_(' (copy)'),
                                     'state':'open',
@@ -213,13 +224,10 @@ class project(osv.osv):
             result.append(new_id)
             cr.execute('select id from project_task where project_id=%s', (proj.id,))
             res = cr.fetchall()
-            for (tasks_id,) in res:
-                task_obj.copy(cr, uid, tasks_id, default = {
-                                    'project_id': new_id,
-                                    'active':True}, context=context)
-            child_ids = self.search(cr, uid, [('parent_id','=', proj.id)], context=context)
+            child_ids = self.search(cr, uid, [('parent_id','=', proj.category_id.id)], context=context)
+            parent_id = self.read(cr, uid, new_id, ['category_id'])['category_id'][0]
             if child_ids:
-                self.duplicate_template(cr, uid, child_ids, context={'parent_id': new_id})
+                self.duplicate_template(cr, uid, child_ids, context={'parent_id': parent_id})
 
         if result and len(result):
             res_id = result[0]
@@ -235,7 +243,7 @@ class project(osv.osv):
                 'view_mode': 'form,tree',
                 'res_model': 'project.project',
                 'view_id': False,
-                'res_id' : res_id,
+                'res_id': res_id,
                 'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
                 'type': 'ir.actions.act_window',
                 'search_view_id': search_view['res_id'],
@@ -244,9 +252,13 @@ class project(osv.osv):
 #        return result
 
     # set active value for a project, its sub projects and its tasks
-    def setActive(self, cr, uid, ids, value=True, context={}):
+    def setActive(self, cr, uid, ids, value=True, context=None):
+        if context is None:
+            context = {}
         task_obj = self.pool.get('project.task')
-        for proj in self.browse(cr, uid, ids, context):
+        for proj in self.browse(cr, uid, ids, context=None):
+            if context is None:
+                context = {}
             self.write(cr, uid, [proj.id], {'state': value and 'open' or 'template'}, context)
             cr.execute('select id from project_task where project_id=%s', (proj.id,))
             tasks_id = [x[0] for x in cr.fetchall()]
@@ -254,7 +266,9 @@ class project(osv.osv):
                 task_obj.write(cr, uid, tasks_id, {'active': value}, context=context)
             child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
             if child_ids:
-                self.setActive(cr, uid, child_ids, value, context)
+                self.setActive(cr, uid, child_ids, value, context=None)
+                if context is None:
+                    context = {}
         return True
 project()
 
@@ -264,13 +278,17 @@ class task(osv.osv):
     _log_create = True
     _date_name = "date_start"
 
-    def _str_get(self, task, level=0, border='***', context={}):
+    def _str_get(self, task, level=0, border='***', context=None):
+        if context is None:
+            context = {}
         return border+' '+(task.user_id and task.user_id.name.upper() or '')+(level and (': L'+str(level)) or '')+(' - %.1fh / %.1fh'%(task.effective_hours or 0.0,task.planned_hours))+' '+border+'\n'+ \
             border[0]+' '+(task.name or '')+'\n'+ \
             (task.description or '')+'\n\n'
 
     # Compute: effective_hours, total_hours, progress
     def _hours_get(self, cr, uid, ids, field_names, args, context=None):
+        if context is None:
+            context = {}
         res = {}
         cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
         hours = dict(cr.fetchall())
@@ -279,17 +297,17 @@ class task(osv.osv):
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 if task.state != 'done':
-                    res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
+                    res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99), 2)
 
-            if task.state in ('done','cancel'):
+            if task.state in ('done', 'cancel'):
                 res[task.id]['progress'] = 100.0
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
         return res
 
     def onchange_planned(self, cr, uid, ids, planned = 0.0, effective = 0.0):
-        return {'value':{'remaining_hours' : planned - effective}}
+        return {'value':{'remaining_hours': planned - effective}}
 
-    def _default_project(self, cr, uid, context={}):
+    def _default_project(self, cr, uid, context=None):
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
         return False
@@ -298,17 +316,21 @@ class task(osv.osv):
     #    ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'),
     #]
 
-    def copy_data(self, cr, uid, id, default={},context={}):
+    def copy_data(self, cr, uid, id, default={}, context=None):
+        if context is None:
+            context = {}
         default = default or {}
         default['work_ids'] = []
         return super(task, self).copy_data(cr, uid, id, default, context)
 
-    def _check_dates(self, cr, uid, ids, context={}):
-         task = self.read(cr, uid, ids[0],['date_start', 'date_end'])
-         if task['date_start'] and task['date_end']:
+    def _check_dates(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        task = self.read(cr, uid, ids[0], ['date_start', 'date_end'])
+        if task['date_start'] and task['date_end']:
              if task['date_start'] > task['date_end']:
                  return False
-         return True
+        return True
 
     _columns = {
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it."),
@@ -316,7 +338,7 @@ class task(osv.osv):
         'description': fields.text('Description'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
-        'type': fields.many2one('project.task.type', 'Stage'),
+        'type': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
@@ -336,19 +358,19 @@ class task(osv.osv):
         'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."),
 
         'user_id': fields.many2one('res.users', 'Assigned to'),
-        'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),
+        'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
-        'manager_id': fields.related('project_id','category_id','user_id', type='many2one', relation='res.users', string='Project Manager'),
+        'manager_id': fields.related('project_id', 'category_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
     _defaults = {
-        'state': lambda *a: 'draft',
-        'priority': lambda *a: '2',
-        'progress': lambda *a: 0,
-        'sequence': lambda *a: 10,
-        'active': lambda *a: True,
-        'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'state': 'draft',
+        'priority': '2',
+        'progress': 0,
+        'sequence': 10,
+        'active': True,
+        'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
         'project_id': _default_project,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
@@ -362,6 +384,8 @@ class task(osv.osv):
     #
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
+        if context is None:
+            context = {}
         obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
@@ -521,11 +545,11 @@ class project_work(osv.osv):
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True),
         'hours': fields.float('Time Spent'),
         'user_id': fields.many2one('res.users', 'Done by', required=True),
-        'company_id': fields.related('task_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
     }
     _defaults = {
         'user_id': lambda obj, cr, uid, context: uid,
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
+        'date': time.strftime('%Y-%m-%d %H:%M:%S')
     }
     _order = "date desc"
     def create(self, cr, uid, vals, *args, **kwargs):
@@ -535,7 +559,9 @@ class project_work(osv.osv):
             cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (vals.get('hours',0.0), vals['task_id']))
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
-    def write(self, cr, uid, ids,vals,context={}):
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         if 'hours' in vals and (not vals['hours']):
             vals['hours'] = 0.00
         if 'hours' in vals:
@@ -546,7 +572,7 @@ class project_work(osv.osv):
     def unlink(self, cr, uid, ids, *args, **kwargs):
         for work in self.browse(cr, uid, ids):
             cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
-        return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
+        return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
 project_work()
 
 class config_compute_remaining(osv.osv_memory):
@@ -554,7 +580,7 @@ class config_compute_remaining(osv.osv_memory):
     def _get_remaining(self,cr, uid, ctx):
         task_obj = self.pool.get('project.task')
         if 'active_id' in ctx:
-            return task_obj.browse(cr,uid,ctx['active_id'],context=ctx).remaining_hours
+            return task_obj.browse(cr, uid, ctx['active_id'], context=ctx).remaining_hours
         return False
 
     _columns = {
@@ -605,15 +631,17 @@ class message(osv.osv):
         'description': fields.text('Description'),
     }
 
-    def _default_project(self, cr, uid, context={}):
+    def _default_project(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
         return False
 
     _defaults = {
-        'user_id' : lambda self,cr,uid,ctx : uid,
-        'date' : lambda self,cr,uid,ctx : time.strftime('%Y-%m-%d'),
-        'project_id':_default_project
+        'user_id': lambda self,cr,uid,ctx: uid,
+        'date': lambda self,cr,uid,ctx: time.strftime('%Y-%m-%d'),
+        'project_id': _default_project
     }
 
 message()
@@ -626,4 +654,18 @@ class users(osv.osv):
      }
 users()
 
+class account_analytic_account(osv.osv):
+
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
+            vals['child_ids'] = []
+        return super(account_analytic_account, self).create(cr, uid, vals, context=context)
+
+account_analytic_account()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 2addd68fa19..a931c96f635 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -8,9 +8,11 @@
             <field name="name">Project</field>
             <field name="object">project.project</field>
         </record>
+
         <record id="req_link_task" model="res.request.link">
             <field name="name">Project task</field>
             <field name="object">project.task</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index f7c46066178..12510f8b944 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -10,10 +10,8 @@
           <form position="attributes">
             <attribute name="string">Project Modules Installation</attribute>
           </form>
-
           <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Project Management</attribute>
+            <attribute name="string">Project Management</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
           	  <attribute name='string'></attribute>
@@ -55,6 +53,7 @@
       <field name="action_id" ref="action_project_installer"/>
       <field name="sequence">3</field>
     </record>
+
      <record id="project_ir_actions_todo_tree" model="ir.ui.view">
 		    <field name="model">ir.actions.todo</field>
 		    <field name="name">project_installer_action_replace</field>
diff --git a/addons/project/project_mailgate.py b/addons/project/project_mailgate.py
index 5409aa4e752..b057c98b03d 100644
--- a/addons/project/project_mailgate.py
+++ b/addons/project/project_mailgate.py
@@ -77,7 +77,9 @@ class project_tasks(osv.osv):
         getattr(self,act)(cr, uid, [id])
         return True
 
-    def message_followers(self, cr, uid, ids, context={}):
+    def message_followers(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         res = []
         if isinstance(ids, (str, int, long)):
             select = [ids]
diff --git a/addons/project/project_resource.py b/addons/project/project_resource.py
index 478fd4316bc..8ff68c94ea8 100644
--- a/addons/project/project_resource.py
+++ b/addons/project/project_resource.py
@@ -1,9 +1,10 @@
 import pooler
 import datetime
 
-def timeformat_convert(cr, uid, time_string, context={}):
+def timeformat_convert(cr, uid, time_string, context=None):
 #    Function to convert input time string:: 8.5 to output time string 8:30
-
+        if context is None:
+            context = {}
         split_list = str(time_string).split('.')
         hour_part = split_list[0]
         mins_part = split_list[1]
@@ -78,4 +79,4 @@ def compute_working_calendar(cr,uid,calendar_id):
         if non_working:
             wktime_cal.append((non_working[:-1],time_range))
 
-        return wktime_cal
\ No newline at end of file
+        return wktime_cal
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3147e392f0d..1d5ade40e69 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,10 +39,9 @@
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                                <field name="warn_manager"/>
                                 <field name="project_escalation_id"/>
+                                <field name="warn_manager"/>
                             </group>
-
                             <newline/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1"/>
@@ -55,11 +54,10 @@
                                 <button
                                     string="New Project Based on Template"
                                     name="duplicate_template"  type="object"
-                                    states="template" icon="gtk-new"/>
+                                    states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
                             </group>
                         </page>
                         <page string="Members">
-                            <separator colspan="4" string="Project's members"/>
                             <field colspan="4" name="members" nolabel="1"/>
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
@@ -103,6 +101,7 @@
                     <field name="complete_name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
+                    <field name="parent_id" invisible="1"/>
                     <field name="effective_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="state"/>
@@ -117,7 +116,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-document-new" string="Draft" domain="[('state', 'in',('draft'))]" help="Draft Projects" default="1"/>
+                       <filter icon="terp-document-new" string="Draft" domain="[('state', 'in',('draft',))]" help="Draft Projects" default="1"/>
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
@@ -129,6 +128,7 @@
                    </group>
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    	<filter string="Parent" name="Parent"  icon="terp-personal" domain = "[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
                       </group>
@@ -431,7 +431,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
@@ -493,7 +493,7 @@
                 <form string="Task Stage">
                     <field name="name" select="1"/>
                     <field name="sequence"/>
-                    <field colspan="4" name="description" select="1"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
@@ -516,9 +516,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="task_type_tree"/>
         </record>
+
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
-        
+
         <act_window domain="[('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"/>
 
         <act_window
@@ -544,7 +545,6 @@
             </field>
         </record>
 
-
       <!--     User Form-->
       <record id="view_project_users_form_simple" model="ir.ui.view">
           <field name="name">res.users.project.form1</field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index b115b576859..fec1052b28b 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -29,14 +29,14 @@ class report_project_task_user(osv.osv):
     _columns = {
         'name': fields.char('Task Summary', size=128, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
+        'year': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
         'date_start': fields.date('Starting Date',readonly=True),
         'no_of_days': fields.integer('# of Days', size=128, readonly=True),
-        'description': fields.text('Description',readonly=True),
-        'date_end': fields.date('Ending Date',readonly=True),
-        'date_deadline': fields.date('Deadline',readonly=True),
-        'project_id':fields.many2one('project.project', 'Project', readonly=True),
+        'description': fields.text('Description', readonly=True),
+        'date_end': fields.date('Ending Date', readonly=True),
+        'date_deadline': fields.date('Deadline', readonly=True),
+        'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
@@ -49,32 +49,21 @@ class report_project_task_user(osv.osv):
                                        help="Number of Days to Open the task"),
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
-        'priority' : fields.selection([('4','Very Low'),
-                                       ('3','Low'),
-                                       ('2','Medium'),
-                                       ('1','Urgent'),
-                                       ('0','Very urgent')],
-                                       'Importance',readonly=True),
-        '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),
-        'state': fields.selection([
-               ('draft', 'Draft'),
-               ('open', 'In Progress'),
-               ('pending', 'Pending'),
-               ('cancelled', 'Cancelled'),
-               ('done', 'Done')],
-            'State', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',readonly=True, groups="base.group_multi_company"),
-        'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
-        'type': fields.many2one('project.task.type', 'Stage',readonly=True),
-
+        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
+('0','Very urgent')], 'Importance', readonly=True),
+        '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),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'State', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'type': fields.many2one('project.task.type', 'Stage', readonly=True),
     }
     _order = 'name desc, project_id'
+
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
         cr.execute("""
-            create view report_project_task_user as
-              select
+            CREATE view report_project_task_user as
+              SELECT
                     (select 1 ) AS nbr,
                     t.id as id,
                     to_char(date_start, 'YYYY') as year,
@@ -102,9 +91,9 @@ class report_project_task_user(osv.osv):
                     (extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
                     (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
                     (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days
-              from project_task t
+              FROM project_task t
 
-                group by 
+                GROUP BY
                     t.id,
                     remaining_hours,
                     t.effective_hours,
@@ -139,37 +128,38 @@ class project_vs_remaining_hours(osv.osv):
     _columns = {
         'project': fields.char('Project', size=128, required=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True)
+        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True, readonly=True)
     }
     _order = 'project desc'
+
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'project_vs_remaining_hours')
         cr.execute("""
-            create or replace view project_vs_remaining_hours as (
+            CREATE or REPLACE view project_vs_remaining_hours as (
                 select
                       min(pt.id) as id,
                       aaa.user_id as uid,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours
-                 from project_project as pp,
+                 FROM project_project as pp,
                        account_analytic_account as aaa,
                        project_task as pt
-                 where aaa.id=pp.category_id and pt.project_id=pp.id and pp.category_id=aaa.id
-                 group by aaa.user_id,aaa.state,aaa.name
+                 WHERE aaa.id=pp.category_id and pt.project_id=pp.id and pp.category_id=aaa.id
+                 GROUP BY aaa.user_id,aaa.state,aaa.name
                  UNION All
-                 select
+                 SELECT
                       min(pt.id) as id,
                       pur.uid as uid,
                       aaa.name as project,
                       aaa.state,
                       sum(pt.remaining_hours) as remaining_hours
-                 from project_project as pp,
+                 FROM project_project as pp,
                       project_user_rel as pur,
                       account_analytic_account as aaa,
                       project_task as pt
-                 where pur.project_id=pp.id and pt.project_id=pp.id and pp.category_id=aaa.id
-                 group by pur.uid,aaa.state,aaa.name
+                 WHERE pur.project_id=pp.id and pt.project_id=pp.id and pp.category_id=aaa.id
+                 GROUP BY pur.uid,aaa.state,aaa.name
             )
         """)
 project_vs_remaining_hours()
@@ -182,52 +172,27 @@ class task_by_days(osv.osv):
         'day': fields.char('Day', size=128, required=True),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True),
         'total_task': fields.float('Total tasks', readonly=True),
-        'project_id':fields.many2one('project.project','Project')
+        'project_id':fields.many2one('project.project', 'Project')
      }
     _order = 'day desc'
+
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'task_by_days')
         cr.execute("""
-            create or replace view task_by_days as (
-                select
+            CREATE or REPLACE view task_by_days as (
+                SELECT
                     min(pt.id) as id,
                     to_char(pt.create_date, 'YYYY-MM-DD') as day,
                     count(*) as total_task,
                     pt.state as state,
                     pt.project_id
-                from
+                FROM
                     project_task as pt
-                group by
+                GROUP BY
                     to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
             )
         """)
 task_by_days()
 
-class task_by_days_vs_planned_hours(osv.osv):
-    _name = "task.by.days.vs.planned.hours"
-    _description = "Task By Days vs Planned Hours"
-    _auto = False
-    _columns = {
-        'day': fields.char('Day', size=128, required=True),
-        'planned_hour': fields.float('Planned Hours', readonly=True),
-        'project_id':fields.many2one('project.project','Project')
-     }
-    _order = 'day desc'
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'task_by_days_vs_planned_hours')
-        cr.execute("""
-            create or replace view task_by_days_vs_planned_hours as (
-                select
-                    min(pt.id) as id,
-                    to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    sum(planned_hours) as planned_hour,
-                    pt.project_id
-                from
-                    project_task as pt
-                group by
-                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.project_id
-            )
-        """)
-task_by_days_vs_planned_hours()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 92edbc78d77..9df6bd1f8ab 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -86,13 +86,13 @@
                     			icon="terp-dialog-close"
                     			name="done"
                     			domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
+                       <separator orientation="vertical"/>
 	                    <field name="project_id">
 	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
-	                        		help="My Projects"
-	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
+	                        		help="My Projects" domain="[('project_id','=',uid)]"/>	
                           </field>
+
                           <field name="user_id" widget="selection">
 	                        <filter icon="terp-personal"
 	                        		string="My Task"
@@ -110,7 +110,7 @@
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -144,6 +144,7 @@
             <field name="search_view_id" ref="view_task_project_user_search"/>
             <field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
+
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
    <!-- Views and action for project dashboard -->
@@ -181,6 +182,7 @@
         <field name="domain">[('uid','=',uid)]</field>
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
+
     <!-- Views and action for project issue dashboard -->
        <record id="view_task_by_days_tree" model="ir.ui.view">
         <field name="name">task.by.days.tree</field>
@@ -221,24 +223,24 @@
     <!-- Views and action for project  dashboard -->
     <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
         <field name="name">task.by.days.vs.planned.hours.tree</field>
-        <field name="model">task.by.days.vs.planned.hours</field>
+        <field name="model">report.project.task.user</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Task By Days vs Planned Hours" >
                 <field name="day"/>
-                <field name="planned_hour"/>
+                <field name="hours_planned"/>
             </tree>
         </field>
     </record>
 
     <record id="view_task_by_days_vs_planned_hours_graph" model="ir.ui.view">
          <field name="name">task.by.days.vs.planned.hours.graph</field>
-         <field name="model">task.by.days.vs.planned.hours</field>
+         <field name="model">report.project.task.user</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Task By Days vs Planned Hours" type="bar">
                  <field name="day"/>
-                 <field name="planned_hour" operator="+"/>
+                 <field name="hours_planned" operator="+"/>
                  <field name="project_id" group="True"/>
              </graph>
          </field>
@@ -246,7 +248,7 @@
 
     <record id="action_task_by_days_vs_planned_hours_graph" model="ir.actions.act_window">
         <field name="name">Task By Days vs Planned Hours</field>
-        <field name="res_model">task.by.days.vs.planned.hours</field>
+        <field name="res_model">report.project.task.user</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index f0297cf6a72..351f28cb283 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -22,11 +22,13 @@
 from osv import fields,osv
 
 class res_partner(osv.osv):
+
     """ Inherits partner and adds CRM information in the partner form """
     _inherit = 'res.partner'
     _columns = {
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
     }
+
 res_partner()
 
 
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 0c030e0c701..99ff1ea3629 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -9,16 +9,10 @@
 "access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
-"access_config_compute_remaining","project.config.compute.remaining","model_config_compute_remaining","project.group_project_user",1,1,1,1
-"access_config_compute_remaining_manager","project.config.compute.remaining.manager","model_config_compute_remaining","project.group_project_manager",1,1,1,1
 "access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
-"access_project_installer","project.installer","model_project_installer","base.group_system",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
 "access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
-"access_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_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_close_task","close.task","model_close_task","project.group_project_user",1,1,1,1
-"access_close_task_manager","close.task manager","model_close_task","project.group_project_manager",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_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",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
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index dbb28db165e..6071e644f34 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -5,9 +5,11 @@
     <record id="group_project_finance" model="res.groups">
         <field name="name">Project / Financial Manager</field>
     </record>
+
     <record id="group_project_manager" model="res.groups">
         <field name="name">Project / Manager</field>
     </record>
+
     <record id="group_project_user" model="res.groups">
         <field name="name">Project / User</field>
     </record>
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index 00752606bd0..b1cd933a4f7 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -33,9 +33,11 @@ class project_close_task(osv.osv_memory):
     _columns = {
         'email': fields.char('E-Mail', size=64, help="Email Address"),
         'description': fields.text('Description'),
-               }
+        }
 
-    def _get_email(self, cr, uid, context={}):
+    def _get_email(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         email = ''
         if 'task_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
@@ -44,7 +46,9 @@ class project_close_task(osv.osv_memory):
                 email = partner_id.address[0].email
         return email
 
-    def _get_desc(self, cr, uid, context={}):
+    def _get_desc(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'task_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
             return task.description or task.name
@@ -55,7 +59,9 @@ class project_close_task(osv.osv_memory):
        'description': _get_desc,
                }
 
-    def confirm(self, cr, uid, ids, context={}):
+    def confirm(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if not 'task_id' in context:
             return {}
         close_task = self.read(cr, uid, ids[0], [])
@@ -88,4 +94,4 @@ class project_close_task(osv.osv_memory):
         return {}
 
 project_close_task()
-# 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/project/wizard/project_close_task_view.xml b/addons/project/wizard/project_close_task_view.xml
index b9bace0aaef..f9206152b25 100644
--- a/addons/project/wizard/project_close_task_view.xml
+++ b/addons/project/wizard/project_close_task_view.xml
@@ -11,10 +11,10 @@
               		  <label string="Send mail to the specified email address"/>
               		  <separator string="" colspan="4"/>
               		  <group colspan="4" col="6">
-	              		  <newline/>
-			              <field name="email"/>
-			              <newline/>
-			              <field name="description" />
+              		  <newline/>
+		              <field name="email"/>
+		              <newline/>
+		              <field name="description" />
 		              </group>
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Close"/>
@@ -36,4 +36,4 @@
     	</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index adfddcd8fd9..30fc02f9ca3 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -33,12 +33,11 @@ class project_task_delegate(osv.osv_memory):
         'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
         'planned_hours': fields.float('Planned Hours',  help="Estimated time to close this task by the delegated user"),
         'planned_hours_me': fields.float('Hours to Validate', required=True, help="Estimated time for you to validate the work done by the user to whom you delegate this task"),
-        'state': fields.selection([('pending','Pending'),
-                                   ('done','Done'),
-                                     ],'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed"),
-            }
+        'state': fields.selection([('pending','Pending'), ('done','Done'), ], 'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed"), }
 
-    def _get_name(self, cr, uid, context={}):
+    def _get_name(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'active_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
             if task.name.startswith(_('CHECK: ')):
@@ -48,13 +47,17 @@ class project_task_delegate(osv.osv_memory):
             return newname
         return ''
 
-    def _get_plan_hour(self, cr, uid, context={}):
+    def _get_plan_hour(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'active_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
             return task.remaining_hours
         return 0.0
 
-    def _get_prefix(self, cr, uid, context={}):
+    def _get_prefix(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'active_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
             if task.name.startswith(_('CHECK: ')):
@@ -64,7 +67,9 @@ class project_task_delegate(osv.osv_memory):
             return _('CHECK: ')+ newname
         return ''
 
-    def _get_new_desc(self, cr, uid, context={}):
+    def _get_new_desc(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'active_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
             return task.description
@@ -79,7 +84,9 @@ class project_task_delegate(osv.osv_memory):
        'state': 'pending',
                }
 
-    def validate(self, cr, uid, ids, context={}):
+    def validate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         task_obj = self.pool.get('project.task')
         delegate_data = self.read(cr, uid, ids, context=context)[0]
         task = task_obj.browse(cr, uid, context['active_id'], context=context)
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 65478e74f0b..762810eba64 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -25,7 +25,7 @@
 		              <field name="state" />
 		              <newline/>
 		              <group colspan="4" col="6">
-		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="validate" string="Validate" type="object"/>
 		              </group>
 			  	</form>
@@ -44,4 +44,4 @@
     	</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index b3e0be57cad..c8f379b18e5 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -20,15 +20,15 @@
 ##############################################################################
 
 {
-    "name" : "Caldav task management",
-    "version" : "1.0",
-    "author" : "Tiny",
-    "category" : "Generic Modules/Others",
+    "name": "Caldav task management",
+    "version": "1.0",
+    "author": "Tiny",
+    "category": "Generic Modules/Others",
     "description": """ Synchronize between Project task and Caldav Vtodo.""",
-    "depends" : ["project", "caldav", "base_calendar"],
-    "init_xml" : ["project_caldav_data.xml"],
-    "demo_xml" : [],
-    "update_xml" : ["project_caldav_view.xml"],
+    "depends": ["project", "caldav", "base_calendar"],
+    "init_xml": ["project_caldav_data.xml"],
+    "demo_xml": [],
+    "update_xml": ["project_caldav_view.xml"],
     "active": False,
     "website": "http://www.openerp.com",
     "installable": True,
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index 62e18784887..b6a87516194 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -26,8 +26,8 @@ class project_task(osv.osv):
     _name = "project.task"
     _inherit = ["calendar.todo", "project.task"]
     _columns = {
-        'write_date' : fields.datetime('Write Date'),
-        'create_date' : fields.datetime('Create Date'),
+        'write_date': fields.datetime('Write Date'),
+        'create_date': fields.datetime('Create Date'),
         'attendee_ids': fields.many2many('calendar.attendee', \
                                          'task_attendee_rel', 'task_id', 'attendee_id', 'Attendees'),
                 }
@@ -37,7 +37,9 @@ class project_task(osv.osv):
         vals = todo_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
 
-    def check_import(self, cr, uid, vals, context={}):
+    def check_import(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         ids = []
         for val in vals:
             obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
@@ -65,7 +67,9 @@ class project_task(osv.osv):
                 ids.append(task_id)
         return ids
 
-    def export_cal(self, cr, uid, ids, context={}):
+    def export_cal(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         task_datas = self.read(cr, uid, ids, [], context ={'read': True})
         tasks = []
         for task in task_datas:
@@ -75,8 +79,7 @@ class project_task(osv.osv):
         todo_obj = self.pool.get('basic.calendar.todo')
         ical = todo_obj.export_cal(cr, uid, tasks, context={'model': self._name})
         calendar_val = ical.serialize()
-        calendar_val = calendar_val.replace('"', '').strip()
-        return calendar_val
+        return calendar_val.replace('"', '').strip()
 
 project_task()
 
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index af0088cf72f..a6b7ef870f4 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -74,11 +74,11 @@
 	
 	
 		<record model="basic.calendar.fields" id="map_todo_10">
-	            <field name="name" ref="caldav.field_todo_vtimezone"/>
-	            <field name="type_id" ref="caldav.calendar_lines_todo" />
-		        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
-	            <field name="fn">field</field>
-	        </record>
+            <field name="name" ref="caldav.field_todo_vtimezone"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+	   </record>
 	
         <record model="basic.calendar.fields" id="map_todo_11">
             <field name="name" ref="caldav.field_todo_summary"/>
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 885878cfcd8..3055fee85bc 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -14,10 +14,9 @@
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                             icon="terp-partner" type="action"
                             context="{'model' : 'project.task'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
+                            <field name="attendee_ids" colspan="4"
                             nolabel="1" widget="one2many" mode="tree,form">
-                            <tree string="Assignees details"
-                                editable="top">
+                            <tree string="Assignees details" editable="top">
                                 <field name="email" />
                                 <field name="role" select="1" />
                                 <field name="state" />
@@ -29,15 +28,12 @@
                                         <field name="rsvp" select="1" />
                                         <field name="cutype" select="1" />
                                         <field name="role" select="1" />
-                                        <separator colspan="4"
-                                            string="" />
+                                        <separator colspan="4" string="" />
                                         <field name="state" />
                                     </page>
                                     <page string="Other">
-                                        <field name="user_id"
-                                            select="1" />
-                                        <field name="partner_address_id"
-                                            select="1" />
+                                        <field name="user_id" select="1" />
+                                        <field name="partner_address_id" select="1" />
                                         <newline />
                                     </page>
                                 </notebook>
@@ -67,15 +63,54 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <group colspan="2" col="3">
-<!--                        <field name="rrule_type" string="Recurrency"
-                            on_change="onchange_rrule_type(rrule_type)" colspan="1" />
--->                        <field name="rrule_type" string="Recurrency"
-                            colspan="1" />
-                        <button string="Custom" name="101"
-                            icon="gtk-save-as" type="action"
-                            context="{'model' : 'project.task'}"
-                            attrs="{'readonly': [('rrule_type','!=','custom')]}" />
+                    <group colspan="2" col="4" >
+                           <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                           <button string="Edit All"
+                               help="Edit all Ourrences of recurrent Task"
+                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                               name="open_meeting" icon="gtk-edit"
+                               type="object" />
+                           <button string="ExRule"
+                                help="Add Exception Rule"
+                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                context="{'model' : 'project.task'}"
+                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+                    </group>
+                    <newline/>
+                    <group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
+                        <separator string="Data for Custom Rule" colspan="8"/>
+                        <group col="8" colspan="4">
+                        <field name="freq" />
+                        <field name="interval" />
+                        <field name="count" />
+                        <field name="end_date" />
+                        </group>
+                        <group col="14" colspan="4" name="Select weekdays" 
+                                attrs="{'invisible': [('freq','=','weekly')]}">
+                        <field name="mo" colspan="1" />
+                        <field name="tu" colspan="1" />
+                        <field name="we" colspan="1" />
+                        <field name="th" colspan="1" />
+                        <field name="fr" colspan="1" />
+                        <field name="sa" colspan="1" />
+                        <field name="su" colspan="1" />
+                        <newline />
+                        </group>
+                        <group col="10" colspan="4" attrs="{'invisible': [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                            <group col="2" colspan="1">
+                            <field name="select1" />
+                            </group>
+                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
+                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+                            </group>
+                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
+                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
+                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
+                            </group>
+                            <group col="1" colspan="1" attrs="{'invisible' : [('freq','!=','yearly')]}">
+                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('freq','=','yearly')]}" />
+                            </group>
+                        </group>
                     </group>
                 </field>
             </field>
@@ -95,7 +130,7 @@
                     <field name="rrule" invisible="1"/>
                 </field>
             </field>
-        </record>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index cc32edbe876..e552228897d 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index d680e533505..c2222fdb5d6 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -46,7 +46,7 @@ class project_gtd_context(osv.osv):
         'project_default_id': fields.many2one('project.project', 'Default Project', required=True),
     }
     _defaults = {
-        'sequence': lambda *args: 1
+        'sequence': 1
     }
     _order = "sequence, name"
 
@@ -125,15 +125,18 @@ class project_task(osv.osv):
      }
 
     def copy_data(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
         if not default:
             default = {}
-        default['timebox_id']=False
-        default['context_id']=False
+        default['timebox_id'] = False
+        default['context_id'] = False
         return super(project_task,self).copy_data(cr, uid, id, default, context)
 
-    def _get_context(self,cr, uid, ctx):
-        ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=ctx)
+    def _get_context(self,cr, uid, context=None):
+        ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=context)
         return ids and ids[0] or False
+
     _defaults = {
         'context_id': _get_context
     }
@@ -192,7 +195,7 @@ class project_task(osv.osv):
             context_id_info['context_id']['selection'] = attrs_sel
             res['fields'].update(context_id_info)
         return res
+
 project_task()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index 06deb221f36..a696e901686 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -67,7 +67,7 @@
         <field name="planned_hours">24.0</field>
         <field name="remaining_hours">24.0</field>
         <field name="timebox_id" ref="timebox_weekly"/>
-          <field name="context_id" ref="context_office"/>
+        <field name="context_id" ref="context_office"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Validation + latest modifications.</field>
@@ -100,7 +100,7 @@
         <field name="planned_hours">24.0</field>
         <field name="remaining_hours">24.0</field>
         <field name="timebox_id" ref="timebox_weekly"/>
-          <field name="context_id" ref="context_office"/>
+        <field name="context_id" ref="context_office"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Validation + latest modifications.</field>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index f5639ea5629..919412cd27d 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -13,6 +13,7 @@
             </tree>
         </field>
     </record>
+
     <record model="ir.ui.view" id="view_gtd_context_form">
         <field name="name">project.gtd.context.form</field>
         <field name="model">project.gtd.context</field>
@@ -25,6 +26,7 @@
             </form>
         </field>
     </record>
+
     <record model="ir.actions.act_window" id="open_gtd_context_tree">
         <field name="name">Contexts</field>
         <field name="res_model">project.gtd.context</field>
@@ -70,6 +72,7 @@
     </record>
 
     <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
+
     <record model="ir.ui.view" id="project_task_tree">
         <field name="name">project.task.tree.timebox</field>
         <field name="model">project.task</field>
diff --git a/addons/project_gtd/wizard/project_gtd_daily_view.xml b/addons/project_gtd/wizard/project_gtd_daily_view.xml
index 5b3e7d3d9e1..c49585f9112 100644
--- a/addons/project_gtd/wizard/project_gtd_daily_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_daily_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="My Daily Timebox">
-              		  <label string="You can open Daily Timebox"/>
-              		  <newline/>
-		              <group colspan="4" col="6">
-				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		              		<button name="open_tb" icon="gtk-ok" string="_Open Timebox" type="object" default_focus="1"/>
+              		<group width="340" height="70">
+              			<label string="You can open Daily Timebox"/>
+              		  	<newline/>
+		              	<group>
+				        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		              	<button name="open_tb" icon="gtk-ok" string="_Open Timebox" type="object" default_focus="1"/>
 		              </group>
+		            </group>
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 4eb4de12c12..01629af87b4 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -63,4 +63,4 @@ class project_timebox_empty(osv.osv_memory):
 
 project_timebox_empty()
 
-# 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/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index ef71ae72978..b39391728a4 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -8,10 +8,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Empty Timebox">
-              		  <label string="Timebox Empty Process Completed Successfully."/>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
-		              </group>
+              		<group width="345" height="70">
+              			<label string="Timebox Empty Process Completed Successfully." />
+							<newline/>
+		            		<button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
+		          	</group>		   
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 8b39dac16ae..34e4a8c2457 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -32,10 +32,14 @@ class project_timebox_fill(osv.osv_memory):
                 }
 
     def _get_from_tb(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         ids = self.pool.get('project.gtd.timebox').search(cr, uid, [], context=context)
         return ids and ids[0] or False
 
     def _get_to_tb(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'active_id' in context:
             return context['active_id']
         return False
@@ -58,4 +62,4 @@ class project_timebox_fill(osv.osv_memory):
 
 project_timebox_fill()
 
-# 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/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 97f9e96afa0..ff90c5c131b 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -48,9 +48,9 @@
         "board_project_issue_view.xml",
      ],
     'demo_xml': ['project_issue_demo.xml'],
-    'test' : [
-              'test/convert_issue_to_task.yml',
-              'test/test_project_issue_states.yml'
+    'test': [
+      'test/convert_issue_to_task.yml',
+      'test/test_project_issue_states.yml'
             ],
     'installable': True,
     'active': False,
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 8b038d1036a..8fe05eddebe 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -85,9 +85,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_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
             icon="terp-graph" action="open_board_project_issue"/>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b9d7baed6dd..f13f816b4ca 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -25,14 +25,14 @@ import re
 import time
 import mx.DateTime
 from datetime import datetime, timedelta
+import binascii
+import collections
 
 import tools
 from crm import crm
 from osv import fields,osv,orm
 from osv.orm import except_orm
 from tools.translate import _
-import collections
-import binascii
 import tools
 
 class project_issue(osv.osv, crm.crm_case):
@@ -54,7 +54,9 @@ class project_issue(osv.osv, crm.crm_case):
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
-    def _compute_day(self, cr, uid, ids, fields, args, context={}):
+    def _compute_day(self, cr, uid, ids, fields, args, context=None):
+        if context is None:
+            context = {}
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -66,7 +68,7 @@ class project_issue(osv.osv, crm.crm_case):
         res_obj = self.pool.get('resource.resource')
 
         res = {}
-        for issue in self.browse(cr, uid, ids, context):
+        for issue in self.browse(cr, uid, ids, context=context):
             for field in fields:
                 res[issue.id] = {}
                 duration = 0
@@ -102,13 +104,7 @@ class project_issue(osv.osv, crm.crm_case):
                     duration = float(ans.days)
                     if issue.project_id and issue.project_id.resource_calendar_id:
                         duration = float(ans.days) * 24
-                        new_dates = cal_obj.interval_min_get(cr,
-                            uid,
-                            issue.project_id.resource_calendar_id.id,
-                            mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
-                            duration,
-                            resource=resource_id
-                        )
+                        new_dates = cal_obj.interval_min_get(cr, uid, issue.project_id.resource_calendar_id.id, mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), duration, resource=resource_id)
                         no_days = []
                         date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
                         for in_time, out_time in new_dates:
@@ -127,8 +123,8 @@ class project_issue(osv.osv, crm.crm_case):
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
         'active': fields.boolean('Active', required=False),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'write_date': fields.datetime('Update Date' , readonly=True),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'write_date': fields.datetime('Update Date', readonly=True),
         'date_deadline': fields.date('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
@@ -140,28 +136,22 @@ class project_issue(osv.osv, crm.crm_case):
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([
-                                    ('draft', 'Draft'),
-                                    ('open', 'Todo'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Closed'),
-                                    ('pending', 'Pending'),
-                                ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Todo'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+        'email_cc': fields.text('Watchers Emails', size=252, help="These people\
  will receive a copy of the future" \
 " communication between partner and users by email"),
         'date_open': fields.datetime('Opened', readonly=True),
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
         'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
         'partner_name': fields.char("Employee's Name", size=64),
@@ -176,7 +166,7 @@ class project_issue(osv.osv, crm.crm_case):
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'assigned_to': fields.many2one('res.users', 'Assigned to'),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 method=True, multi='working_days_open', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
@@ -188,21 +178,21 @@ class project_issue(osv.osv, crm.crm_case):
     }
 
     def _get_project(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-       if user.context_project_id:
-           return user.context_project_id.id
-       return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.context_project_id:
+            return user.context_project_id.id
+        return False
 
     _defaults = {
-        'active': lambda *a: 1,
+        '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': lambda *a: 'draft',
+        'state': 'draft',
         'section_id': crm.crm_case. _get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
     }
 
@@ -214,11 +204,6 @@ class project_issue(osv.osv, crm.crm_case):
         if context is None:
             context = {}
 
-#        for case in case_obj.browse(cr, uid, ids, context=context):
-#            if case.state != 'open':
-#                raise osv.except_osv(_('Warning !'),
-#                    _('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
-
         result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         res = data_obj.read(cr, uid, result, ['res_id'])
         id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
@@ -234,17 +219,15 @@ class project_issue(osv.osv, crm.crm_case):
                 'partner_id': bug.partner_id.id,
                 'description':bug.description,
                 'date': bug.date,
-                'project_id':bug.project_id.id,
-                'priority':bug.priority,
-                'user_id':bug.assigned_to.id,
+                'project_id': bug.project_id.id,
+                'priority': bug.priority,
+                'user_id': bug.assigned_to.id,
                 'planned_hours': 0.0,
             })
 
-            new_task = task_obj.browse(cr, uid, new_task_id)
-
             vals = {
                 'task_id': new_task_id,
-                }
+            }
             case_obj.write(cr, uid, [bug.id], vals)
 
         return  {
@@ -276,7 +259,9 @@ class project_issue(osv.osv, crm.crm_case):
     def convert_to_bug(self, cr, uid, ids, context=None):
         return self._convert(cr, uid, ids, 'bug_categ', context=context)
 
-    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
+        if context is None:
+            context = {}
         if not stage_id:
             return {'value':{}}
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
@@ -307,7 +292,7 @@ class project_issue(osv.osv, crm.crm_case):
     def message_new(self, cr, uid, msg, context):
         """
         Automatically calls when new email message arrives
-        
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
@@ -319,7 +304,7 @@ class project_issue(osv.osv, crm.crm_case):
         body = msg.get('body')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-        
+
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -329,18 +314,18 @@ class project_issue(osv.osv, crm.crm_case):
         }
         if msg.get('priority', False):
             vals['priority'] = priority
-        
+
         res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
         self.convert_to_bug(cr, uid, [res], context=context)
-        
+
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
                 'name': attactment,
-                'datas':binascii.b2a_base64(str(attachents.get(attactment))),
+                'datas': binascii.b2a_base64(str(attachents.get(attactment))),
                 'datas_fname': attactment,
                 'description': 'Mail attachment',
                 'res_model': self._name,
@@ -350,18 +335,19 @@ class project_issue(osv.osv, crm.crm_case):
 
         return res
 
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
-        """ 
+    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
+        if context is None:
+            context = {}
+        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs 
+        @param ids: List of update mail’s IDs
         """
-        
+
         if isinstance(ids, (str, int, long)):
             ids = [ids]
-        
-        msg_from = msg['from']
+
         vals.update({
             'description': msg['body']
         })
@@ -369,9 +355,9 @@ class project_issue(osv.osv, crm.crm_case):
             vals['priority'] = msg.get('priority')
 
         maps = {
-            'cost':'planned_cost',
+            'cost': 'planned_cost',
             'revenue': 'planned_revenue',
-            'probability':'probability'
+            'probability': 'probability'
         }
         vls = { }
         for line in msg['body'].split('\n'):
@@ -380,7 +366,7 @@ class project_issue(osv.osv, crm.crm_case):
             if res and maps.get(res.group(1).lower(), False):
                 key = maps.get(res.group(1).lower())
                 vls[key] = res.group(2).lower()
-        
+
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
         return res
@@ -407,4 +393,4 @@ class project(osv.osv):
     }
 project()
 
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index a87039274f3..fb914dfaca2 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
+
     <!--
     Case Categories
     -->
@@ -11,6 +12,7 @@
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
     </record>    
+
     <record model="crm.case.categ" id="feature_request_categ">
         <field name="name">Feature Requests</field>
         <field name="section_id" ref="crm.section_sales_department"/>
@@ -25,7 +27,8 @@
         <field name="name">Version 4.2</field>
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>        
-    </record>    
+    </record>
+    
     <record model="crm.case.resource.type" id="type2">
         <field name="name">Version 4.4</field>
         <field name="section_id" ref="crm.section_sales_department"/>
@@ -67,5 +70,6 @@
         <field name="section_id" ref="crm.section_sales_department"/>
 		<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>         
     </record>
+
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index aee12ccf01e..ad6af0e02b0 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <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"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index fefdd496559..05080670e10 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -2,7 +2,6 @@
 <openerp>
 <data>
 
-
     ######################## ISSUE TRACKING (menu) ###########################
     <!--
         ALL BUGS
@@ -14,21 +13,24 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
-        <field name="context">{"search_default_user_id": uid,"search_default_current":1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="act_window_id" ref="project_issue_categ_act0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="project_issue_calendar_view"/>
         <field name="act_window_id" ref="project_issue_categ_act0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fd523ad7774..0bdee911cee 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -31,58 +31,56 @@
             <field name="arch" type="xml">
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
-                        <field name="name"/>
-                        <field name="project_id" required="True"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="user_id"/>
-                        <field name="assigned_to" />
+                    <field name="name"/>
+                    <field name="project_id" required="True"/>
+                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    <field name="user_id"/>
+                    <field name="assigned_to" />
                         <group colspan="2" col="4">
-                            <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
-                            <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
+                        <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
+                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Communication"/>
-                                <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"/>
+                            <separator colspan="2" string="Communication"/>
+                            <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">
-                                <separator colspan="3" string="Status"/>
-                                <field name="type_id" colspan="3"/>
-                                <field name="priority" colspan="3"/>
-                                <field name="task_id" />
-                                <button string="Convert To Task"
-                                    name="convert_issue_task"
-                                    icon="gtk-index" type="object"
-                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            <separator colspan="3" string="Status"/>
+                            <field name="type_id" colspan="3"/>
+                            <field name="priority" colspan="3"/>
+                            <field name="task_id" />
+                            <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
+                                attrs="{'invisible':[('task_id','!=',False)]}" />
                             </group>
                             <separator string= "Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" />
-                                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                            <field name="state" />
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                                <field colspan="4" name="email_cc" string="CC"/>
+                            <field colspan="4" name="email_cc" string="CC"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Communication history">
                                     <group col="6" colspan="4">
-                                        <field name="date"/>
-                                        <field name="email_to"/>
-                                        <field name="email_from"/>
+                                    <field name="date"/>
+                                    <field name="email_to"/>
+                                    <field name="email_from"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
@@ -92,9 +90,7 @@
                                             <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
                                         </page>
                                     </notebook>
-                                    <button colspan="4"
-                                    string="Reply to Last Email"
-                                    name="%(crm.action_crm_send_mail)d"
+                                    <button colspan="4" string="Reply to Last Email" name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
                                     icon="gtk-undo" type="action" />
                                 </form>
@@ -105,6 +101,7 @@
                                     <field name="description"/>
                                 </tree>
                            </field>
+                           <separator colspan="4"/>
                            <button colspan="4" string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'project.issue'}"
@@ -112,23 +109,23 @@
                         </page>
                            <page string="History" groups="base.group_extended">
                             <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"/>
+                            <separator colspan="2" string="Date"/>
+                            <field name="create_date"/>
+                            <field name="write_date" />
+                            <field name="date_closed"/>
+                            <field name="date_open"/>
                             </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"/>
+                            <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"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="References" colspan="2"/>
-                                <field name="id"/>
-                                <field name="active"/>
+                            <separator string="References" colspan="2"/>
+                            <field name="id"/>
+                            <field name="active"/>
                             </group>
                             <field name="log_ids" nolabel="1" colspan="4">
                                 <tree string="Logs">
@@ -148,6 +145,7 @@
                 </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="project_issue_tree_view">
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
@@ -156,15 +154,14 @@
                 <tree string="Issue Tracker Tree"  colors="red:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="id"/>
                     <field name="create_date"/>
+                    <field name="project_id" invisible="1"/>
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Severity"/>
                     <field name="stage_id" string="Resolution"/>
-                    <button icon="gtk-go-back" string=""
-                        name="stage_previous" type="object"
+                    <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
-                    <button icon="gtk-go-forward" string=""
-                        name="stage_next" type="object"
+                    <button icon="gtk-go-forward" string="" name="stage_next" type="object"
                         states="open,draft,pending,done,cancel" />
                     <field name="type_id" string="Version"/>
                     <field name="user_id"/>
@@ -191,14 +188,9 @@
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="   Today   "
-                            separator="1"
-                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Today's bugs"
-                            />
-                        <filter icon="terp-go-week"
-                            string="    7 Days    " separator="1"
-                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        <filter icon="terp-go-today" string="   Today   " separator="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
+                        <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
                         <separator orientation="vertical"/>
@@ -258,11 +250,9 @@
                     <field name="partner_id"/>
                     <field name="priority" string="Severity"/>
                     <field name="stage_id" string="Resolution"/>
-                    <button icon="gtk-go-back" string=""
-                        name="stage_previous" type="object"
+                    <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
-                    <button icon="gtk-go-forward" string=""
-                        name="stage_next" type="object"
+                    <button icon="gtk-go-forward" string="" name="stage_next" type="object"
                         states="open,draft,pending,done,cancel" />
                     <field name="type_id" string="Version"/>
                     <field name="user_id"/>
@@ -284,16 +274,10 @@
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <group>
-                        <filter icon="terp-go-today" string="   Today   "
-                            separator="1"
-                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Today's features"
-                            />
-                        <filter icon="terp-go-week"
-                            string="    7 Days    " separator="1"
-                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Features during last 7 days"
-                            />
+                        <filter icon="terp-go-today" string="   Today   " separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
+                        <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Features during last 7 days"/>
                     </group>
                     <separator orientation="vertical"/>
                     <group>
@@ -304,7 +288,6 @@
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
                         <field name="project_id" select="1" string="Project"/>
-
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 92f170eb556..833a792c34d 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -13,14 +13,15 @@ class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
 
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+    def _get_data(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         """ @param cr: the current row, from the database cursor,
             @param uid: the current users ID for security checks,
             @param ids: List of case and section Datas IDs
             @param context: A standard dictionary for contextual values """
 
         res = {}
-        state_perc = 0.0
         avg_ans = 0.0
 
         for case in self.browse(cr, uid, ids, context):
@@ -85,15 +86,16 @@ class project_issue_report(osv.osv):
         'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
-        'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" )
+        'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
+        'email': fields.integer('# Emails', size=128, readonly=True),
     }
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
         cr.execute("""
-            create or replace view project_issue_report as (
-                select
-                    min(c.id) as id,
+            CREATE OR REPLACE VIEW project_issue_report AS (
+                SELECT
+                    c.id as id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
@@ -111,44 +113,19 @@ class project_issue_report(osv.osv):
                     c.priority as priority,
                     c.project_id as project_id,
                     c.type_id as type_id,
-                    (select 1) as nbr,
+                    1 as nbr,
                     c.assigned_to,
                     c.partner_id,
                     c.canal_id,
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
-                    avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
-                from
+                    extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
+                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
+                FROM
                     project_issue c
-                where c.categ_id in (select res_id from ir_model_data where name='bug_categ')
-                group by
-                    to_char(c.create_date, 'YYYY'),
-                    to_char(c.create_date, 'MM'),
-                    to_char(c.create_date, 'YYYY-MM-DD'),
-                    c.state,
-                    to_char(c.date_open, 'YYYY-MM-DD'),
-                    to_char(c.date_closed, 'YYYY-mm-dd'),
-                    c.user_id,
-                    c.section_id,
-                    c.categ_id,
-                    c.stage_id,
-                    c.company_id,
-                    c.priority,
-                    c.working_hours_open,
-                    c.working_hours_close,
-                    c.project_id,
-                    to_char(c.date_closed, 'YYYY-MM-DD'),
-                    c.type_id,
-                    c.working_hours_open,
-                    c.working_hours_close,
-                    date_trunc('day',c.create_date),
-                    c.assigned_to,
-                    c.partner_id,
-                    c.canal_id,
-                    c.task_id
-            )""") 
-
+                WHERE c.categ_id IN (select res_id from ir_model_data WHERE model = 'crm.case.categ' and name='bug_categ')
+            )""")
 project_issue_report()
 
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 47ae02005f2..7405026d05d 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -25,11 +25,12 @@
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
-                    <field name="nbr" string="#Project Issue" sum='#Number of Project Issue'/>
+                    <field name="nbr" string="#Project Issues" sum='#Number of Project Issues'/>
                     <field name="delay_open" avg='Avg Opening Delay'/>
                     <field name="delay_close" avg='Avg Closing Delay'/>
                     <field name="working_hours_open" sum='Open Working Hours'/>
                     <field name="working_hours_close" sum='Close Working hours'/>
+                    <field name="email" sum='# Emails'/>
                   </tree>
             </field>
         </record>
@@ -130,7 +131,7 @@
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                    		<field name="partner_id"  />
+                    		<field name="partner_id"/>
                     		<field name="assigned_to" widget="selection"/>
                     		<separator orientation="vertical"/>
                     		<field name="priority" />
@@ -150,7 +151,7 @@
         </record>
 
         <record id="action_project_issue_report" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
+            <field name="name">Issue Analysis</field>
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 2a0b1f24bce..29b2532eb55 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
+"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
 "access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
 "access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
 "access_project_issue_report","project.issue.report","model_project_issue_report","project_issue.group_project_supporter",1,1,1,1
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index 82b6c003d91..1c0c23aad8d 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="1">
+    <data noupdate="1">
 
      <record id="group_project_supporter" model="res.groups">
         <field name="name">Project / Support Manager</field>
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index 6fd6bebfe6c..7f2d124f8b8 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -25,22 +25,22 @@
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """
-        This module adds the Timesheet support for the Issues/Bugs Management in Project
-    """,
+    'description': """ 
+                    This module adds the Timesheet support for the Issues/Bugs Management in Project
+                """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
         'project_issue',
         'hr_timesheet_sheet',
-    ],
+        ],
     'init_xml': [
-    ],
+        ],
     'update_xml': [
         'project_issue_sheet_view.xml',
-     ],
+        ],
     'demo_xml': [
-    ],
+        ],
     'installable': True,
     'active': False,
 }
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 4027dab3572..99d08c51f2d 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -24,25 +24,30 @@ from tools.translate import _
 
 class project_issue(osv.osv):
     _inherit = 'project.issue'
+    _description = 'project issue'
     _columns = {
-        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.related('project_id','category_id',string='Analytic Account')
+        'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id': fields.related('project_id', 'category_id', string='Analytic Account')
     }
 project_issue()
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
-
+    _description = 'account analytic line'
     _columns = {
         'create_date' : fields.datetime('Create Date', readonly=True),
-    }
+                }
 
 account_analytic_line()
 
 class hr_analytic_issue(osv.osv):
+
     _inherit = 'hr.analytic.timesheet'
+    _description = 'hr analytic timesheet'
     _columns = {
         'issue_id' : fields.many2one('project.issue', 'Issue'),
     }
+
 hr_analytic_issue()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 12171d0a429..fbc1dccc2ed 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -17,7 +17,6 @@
                                 <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
-
                                 <field invisible="1" name="journal_id"/>
                                 <field invisible="1" name="product_id"/>
                                 <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
diff --git a/addons/project_long_term/__init__.py b/addons/project_long_term/__init__.py
index 8efcc1a0007..6b9b2613f3f 100644
--- a/addons/project_long_term/__init__.py
+++ b/addons/project_long_term/__init__.py
@@ -22,4 +22,4 @@
 import project_long_term
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 7bc0e3c9984..dfcddb75b48 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -18,13 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
-    "name" : "Long Term Project Management",
+    "name": "Long Term Project Management",
     "version": "1.1",
-    "author" : "Tiny",
-    "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Projects & Services",
-    "depends" : ["project", "resource"],
+    "author": "Tiny",
+    "website": "http://www.openerp.com",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["project", "resource"],
     "description": """
 
         Long Term Project management module that tracks planning, scheduling, resources allocation.
@@ -36,9 +37,9 @@
             - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
 
     """,
-    "init_xml" : [],
-    "demo_xml" : ["project_long_term_demo.xml"],
-    "test" : [
+    "init_xml": [],
+    "demo_xml": ["project_long_term_demo.xml"],
+    "test": [
               'test/schedule_project_phases.yml',
               'test/schedule_project_tasks.yml',
               'test/schedule_phase_tasks.yml'
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index f1c40a4c8ba..4520e798f4e 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -29,7 +29,10 @@ class project_phase(osv.osv):
     _name = "project.phase"
     _description = "Project Phase"
 
-    def _check_recursion(self, cr, uid, ids, context={}):
+    def _check_recursion(self, cr, uid, ids, context=None):
+         if context is None:
+            context = {}
+
          data_phase = self.browse(cr, uid, ids[0], context=context)
          prev_ids = data_phase.previous_phase_ids
          next_ids = data_phase.next_phase_ids
@@ -45,7 +48,7 @@ class project_phase(osv.osv):
          next_ids = [rec.id for rec in next_ids]
          # iter prev_ids
          while prev_ids:
-             cr.execute('select distinct prv_phase_id from project_phase_rel where next_phase_id IN %s',(tuple(prev_ids),))
+             cr.execute('SELECT distinct prv_phase_id FROM project_phase_rel WHERE next_phase_id IN %s', (tuple(prev_ids),))
              prv_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
              if data_phase.id in prv_phase_ids:
                  return False
@@ -55,7 +58,7 @@ class project_phase(osv.osv):
              prev_ids = prv_phase_ids
          # iter next_ids
          while next_ids:
-             cr.execute('select distinct next_phase_id from project_phase_rel where prv_phase_id IN %s',(tuple(next_ids),))
+             cr.execute('SELECT distinct next_phase_id FROM project_phase_rel WHERE prv_phase_id IN %s', (tuple(next_ids),))
              next_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
              if data_phase.id in next_phase_ids:
                  return False
@@ -65,19 +68,19 @@ class project_phase(osv.osv):
              next_ids = next_phase_ids
          return True
 
-    def _check_dates(self, cr, uid, ids, context={}):
+    def _check_dates(self, cr, uid, ids, context=None):
          for phase in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
              if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
                  return False
          return True
 
-    def _check_constraint_start(self, cr, uid, ids, context={}):
+    def _check_constraint_start(self, cr, uid, ids, context=None):
          phase = self.read(cr, uid, ids[0], ['date_start', 'constraint_date_start'], context=context)
          if phase['date_start'] and phase['constraint_date_start'] and phase['date_start'] < phase['constraint_date_start']:
              return False
          return True
 
-    def _check_constraint_end(self, cr, uid, ids, context={}):
+    def _check_constraint_end(self, cr, uid, ids, context=None):
          phase = self.read(cr, uid, ids[0], ['date_end', 'constraint_date_end'], context=context)
          if phase['date_end'] and phase['constraint_date_end'] and phase['date_end'] > phase['constraint_date_end']:
              return False
@@ -97,7 +100,7 @@ class project_phase(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"),
         'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"),
-        'responsible_id':fields.many2one('res.users', 'Responsible'),
+        'responsible_id': fields.many2one('res.users', 'Responsible'),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.')
@@ -116,7 +119,7 @@ class project_phase(osv.osv):
         #(_check_constraint_end, 'Phase must end-before constraint end Date.', ['date_end', 'constraint_date_end']),
     ]
 
-    def onchange_project(self, cr, uid, ids, project, context={}):
+    def onchange_project(self, cr, uid, ids, project, context=None):
         result = {}
         project_obj = self.pool.get('project.project')
         if project:
@@ -126,7 +129,9 @@ class project_phase(osv.osv):
                 return {'value': result}
         return {'value': {'date_start': []}}
 
-    def _check_date_start(self, cr, uid, phase, date_end, context={}):
+    def _check_date_start(self, cr, uid, phase, date_end, context=None):
+       if context is None:
+            context = {}
        """
        Check And Compute date_end of phase if change in date_start < older time.
        """
@@ -147,7 +152,9 @@ class project_phase(osv.osv):
        dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
        self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
-    def _check_date_end(self, cr, uid, phase, date_start, context={}):
+    def _check_date_end(self, cr, uid, phase, date_start, context=None):
+       if context is None:
+            context = {}
        """
        Check And Compute date_end of phase if change in date_end > older time.
        """
@@ -168,11 +175,11 @@ class project_phase(osv.osv):
        dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
        self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'), 'date_end': dt_end}, context=context)
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         resource_calendar_obj = self.pool.get('resource.calendar')
         resource_obj = self.pool.get('resource.resource')
         uom_obj = self.pool.get('product.uom')
-        if not context:
+        if context is None:
             context = {}
         if context.get('scheduler',False):
             return super(project_phase, self).write(cr, uid, ids, vals, context=context)
@@ -191,7 +198,7 @@ class project_phase(osv.osv):
         # Change the date_start and date_end
         # for previous and next phases respectively based on valid condition
         if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
-                dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S')
+                dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S')
                 work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
                 if work_times:
                     vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
@@ -214,7 +221,7 @@ class project_phase(osv.osv):
         self.write(cr, uid, ids, {'state': 'open'})
         return True
 
-    def set_pending(self, cr, uid, ids,*args):
+    def set_pending(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'pending'})
         return True
 
diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml
index 32d041544cc..8da591f1337 100644
--- a/addons/project_long_term/project_long_term_data.xml
+++ b/addons/project_long_term/project_long_term_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- Requests Links -->
         <record id="req_link_project" model="res.request.link">
             <field name="name">Project</field>
@@ -10,5 +11,6 @@
             <field name="name">Project task</field>
             <field name="object">project.task</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 657658eba46..fd965e4c792 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -8,151 +8,151 @@
             <field name="address_id" ref="base.main_address"/>
             <field name="context_lang">en_US</field>
             <field name="name">Demo User1</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="signature">Mr Demo</field>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Setup')]"/>
             <field name="login">demo1</field>
             <field name="password">demo1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_manager0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">Manager1</field>
-            <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_manager')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">manager1</field>
             <field name="password">manager1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_manager1" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">Manager2</field>
-            <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_manager')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">manager2</field>
             <field name="password">manager2</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_user0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user1</field>
-            <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user1</field>
             <field name="password">USER1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_user1" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user2</field>
-            <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user2</field>
             <field name="password">user2</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_userfinance0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_finance</field>
-            <field eval="[(6,0,[ref('base.group_user'),ref('project.group_project_finance')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_finance</field>
             <field name="password">user_finance</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_userdesign0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_design1</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_design1</field>
             <field name="password">user_design1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_userdesign1" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_design2</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_design2</field>
             <field name="password">user_design2</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_userdeveloper0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_developer1</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_developer1</field>
             <field name="password">user_developer1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_userdeveloper1" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_developer2</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_developer2</field>
             <field name="password">user_developer1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_usertester0" model="res.users">
@@ -161,43 +161,43 @@
             <field name="name">user_tester1</field>
             <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_tester1</field>
             <field name="password">user_tester1</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_usertester1" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_tester2</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_tester2</field>
             <field name="password">user_tester2</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <record id="res_users_useranalyst0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
             <field name="context_lang">en_US</field>
             <field name="name">user_analyst</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
+            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6,0,[])]" name="roles_id"/>
-            <field eval="[(6,0,[])]" name="rules_id"/>
+            <field eval="[(6, 0, [])]" name="roles_id"/>
+            <field eval="[(6, 0, [])]" name="rules_id"/>
             <field eval="1" name="active"/>
             <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
             <field name="login">user_analyst</field>
             <field name="password">user_analyst</field>
-            <field eval="[(6,0,[])]" name="company_ids"/>
+            <field eval="[(6, 0, [])]" name="company_ids"/>
         </record>
 
         <!-- Resources -->
@@ -255,17 +255,17 @@
             <field name="state">open</field>
             <field name="type">normal</field>
             <field name="description">Develop an OpenERP Website.</field>
-            <field eval="[(6,0,[ref('res_users_manager0'),ref('res_users_user0'),ref('res_users_userfinance0'),ref('res_users_userdesign0'),ref('res_users_userdeveloper0'),ref('res_users_usertester0'),ref('res_users_useranalyst0')])]" name="members"/>
+            <field eval="[(6, 0, [ref('res_users_manager0'), ref('res_users_user0'), ref('res_users_userfinance0'), ref('res_users_userdesign0'), ref('res_users_userdeveloper0'), ref('res_users_usertester0'), ref('res_users_useranalyst0')])]" name="members"/>
             <field name="date">2010-04-30</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="currency_id" ref="base.EUR"/>
-            <field eval="[(6,0,[])]" name="type_ids"/>
+            <field eval="[(6, 0, [])]" name="type_ids"/>
             <field name="name">OpenERP Website Development</field>
         </record>
 
         <!-- Project Phases -->
         <record id="project_phase_informationgatheringandunderstanding0" model="project.phase">
-            <field eval="[(6,0,[])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
             <field name="name">Information Gathering and Understanding</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
@@ -280,7 +280,7 @@
         </record>
 
         <record id="project_phase_planning0" model="project.phase">
-            <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0')])]" name="previous_phase_ids"/>
             <field name="name">Planning</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
@@ -295,7 +295,7 @@
         </record>
 
         <record id="project_phase_webdesign0" model="project.phase">
-            <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0')])]" name="previous_phase_ids"/>
             <field name="name">Web Design </field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
@@ -310,7 +310,7 @@
         </record>
 
         <record id="project_phase_developmentintegrationandtesting0" model="project.phase">
-            <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0'),ref('project_phase_webdesign0')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0')])]" name="previous_phase_ids"/>
             <field name="name">Development, Integration and Testing</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
@@ -325,7 +325,7 @@
         </record>
 
         <record id="project_phase_websitedeployment0" model="project.phase">
-            <field eval="[(6,0,[ref('project_phase_informationgatheringandunderstanding0'),ref('project_phase_planning0'),ref('project_phase_webdesign0'),ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/>
+            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0'), ref('project_phase_planning0'), ref('project_phase_webdesign0'), ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/>
             <field name="name">Website Deployment</field>
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="10" name="sequence"/>
@@ -403,10 +403,9 @@
             <field name="date_start">2010-02-24 05:00:00</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Prepare Requirements Document</field>
             <field name="date_deadline">2010-03-08</field>
@@ -422,10 +421,9 @@
             <field name="date_start">2010-02-25 15:38:08</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Define Website Goals, Purposes and Target Audience</field>
             <field name="date_deadline">2010-03-04</field>
@@ -441,10 +439,9 @@
             <field name="date_start">2010-02-25 15:42:42</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Use Cases</field>
             <field name="date_deadline">2010-03-10</field>
@@ -460,10 +457,9 @@
             <field name="date_start">2010-02-25 15:51:00</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Budget Planning</field>
             <field name="date_deadline">2010-03-31</field>
@@ -479,10 +475,9 @@
             <field name="date_start">2010-02-25 15:54:42</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Quality Planning</field>
             <field name="date_deadline">2010-03-31</field>
@@ -498,10 +493,9 @@
             <field name="date_start">2010-02-25 15:55:11</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Risk Management Planning</field>
             <field name="date_deadline">2010-03-31</field>
@@ -517,10 +511,9 @@
             <field name="date_start">2010-02-25 15:57:48</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Create Project Schedules</field>
             <field name="date_deadline">2010-03-31</field>
@@ -536,10 +529,9 @@
             <field name="date_start">2010-02-25 16:04:16</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Dataflow Design</field>
             <field name="date_deadline">2010-04-02</field>
@@ -555,10 +547,9 @@
             <field name="date_start">2010-02-25 16:05:43</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">User Interface Design</field>
             <field name="date_deadline">2010-04-10</field>
@@ -574,10 +565,9 @@
             <field name="date_start">2010-02-25 16:06:52</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Task Level WBS</field>
             <field name="date_deadline">2010-04-07</field>
@@ -593,10 +583,9 @@
             <field name="date_start">2010-02-25 16:11:40</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Modular Programming</field>
             <field name="date_deadline">2010-04-22</field>
@@ -611,10 +600,9 @@
             <field name="date_start">2010-02-25 16:13:10</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Integrate Modules</field>
             <field name="date_deadline">2010-04-24</field>
@@ -629,10 +617,9 @@
             <field name="date_start">2010-02-25 16:14:32</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Unit Testing</field>
             <field name="date_deadline">2010-04-24</field>
@@ -647,10 +634,9 @@
             <field name="date_start">2010-02-25 16:15:38</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Regression Test</field>
             <field name="date_deadline">2010-04-24</field>
@@ -665,10 +651,9 @@
             <field name="date_start">2010-02-25 16:17:04</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Documentation</field>
             <field name="date_deadline">2010-04-24</field>
@@ -683,10 +668,9 @@
             <field name="date_start">2010-02-25 16:17:42</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Performance Tuning</field>
             <field name="date_deadline">2010-04-24</field>
@@ -701,10 +685,9 @@
             <field name="date_start">2010-02-25 16:21:15</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Deploy Website</field>
             <field name="date_deadline">2010-04-26</field>
@@ -719,10 +702,9 @@
             <field name="date_start">2010-02-25 16:22:09</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Presentation</field>
             <field name="date_deadline">2010-04-28</field>
@@ -737,10 +719,9 @@
             <field name="date_start">2010-02-25 16:36:02</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Deployment</field>
             <field name="date_deadline">2010-04-28</field>
@@ -756,10 +737,9 @@
             <field name="date_start">2010-02-25 16:36:43</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Presentation</field>
             <field name="date_deadline">2010-04-29</field>
@@ -775,10 +755,9 @@
             <field name="date_start">2010-02-25 17:22:46</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Modules Integration</field>
             <field name="date_deadline">2010-04-24</field>
@@ -794,10 +773,9 @@
             <field name="date_start">2010-02-25 17:34:32</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Unit Testing</field>
             <field name="date_deadline">2010-04-24</field>
@@ -813,10 +791,9 @@
             <field name="date_start">2010-02-25 17:35:46</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Modular Testing</field>
             <field name="date_deadline">2010-04-24</field>
@@ -832,10 +809,9 @@
             <field name="date_start">2010-02-25 17:36:27</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Documentation</field>
             <field name="date_deadline">2010-04-28</field>
@@ -851,10 +827,9 @@
             <field name="date_start">2010-02-25 17:37:03</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Performance Tuning</field>
             <field name="date_deadline">2010-04-27</field>
@@ -871,10 +846,9 @@
             <field name="date_start">2010-03-01 12:00:00</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">2</field>
-            <field name="state">draft</field>
             <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="[(6,0,[])]" name="parent_ids"/>
+            <field eval="[(6, 0, [])]" name="child_ids"/>
+            <field eval="[(6, 0, [])]" name="parent_ids"/>
             <field eval="1" name="active"/>
             <field name="name">Modular Programming</field>
             <field name="date_deadline">2010-04-22</field>
@@ -882,5 +856,6 @@
             <field eval="100.0" name="remaining_hours"/>
             <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_report.xml b/addons/project_long_term/project_long_term_report.xml
index 3bbbce1874c..d8fe2a4fa6e 100644
--- a/addons/project_long_term/project_long_term_report.xml
+++ b/addons/project_long_term/project_long_term_report.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <report auto="False" id="report_project_task_gantt" model="project.task" name="project.tasks.gantt" string="Gantt Representation"/>
         <report auto="False" id="report_project_project_gantt" model="project.project" name="project.project.gantt" string="Gantt Representation"/>
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 478fbd19785..4170c0064d0 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -107,23 +107,7 @@
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Other Info">
-                           <group colspan="2" col="2">
-                                <separator string="Constraints" colspan="2"/>
-                                <field name="constraint_date_start"/>
-                                <field name="constraint_date_end"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Scheduling" colspan="2"/>
-                                <field name="sequence"/>
-                            </group>
-                           <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
-                        </page>
                         <page string="Task Detail">
-                            <separator colspan="4" string="Project's Tasks"/>
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
                                  <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
@@ -158,6 +142,21 @@
                              </field>
                                <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
+                        <page string="Other Info">
+                           <group colspan="2" col="2">
+                                <separator string="Constraints" colspan="2"/>
+                                <field name="constraint_date_start"/>
+                                <field name="constraint_date_end"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Scheduling" colspan="2"/>
+                                <field name="sequence"/>
+                            </group>
+                           <separator colspan="4" string="Previous Phases"/>
+                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
+                           <separator colspan="4" string="Next Phases"/>
+                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                        </page>
                     </notebook>
                     <newline/>
                 </form>
diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml
index ea43762653c..7f3668c6b1a 100644
--- a/addons/project_long_term/project_long_term_wizard.xml
+++ b/addons/project_long_term/project_long_term_wizard.xml
@@ -6,7 +6,7 @@
         <!--<wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>-->
         <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>-->
 
-<!--		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>-->
+    <!--<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>-->
 		<!--<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>-->
 	<!--	<menuitem
             action="wizard_compute_phase"
diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml
index f476ac16cd6..3a821ddd274 100644
--- a/addons/project_long_term/project_long_term_workflow.xml
+++ b/addons/project_long_term/project_long_term_workflow.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
 		<record id="wkf_phase" model="workflow">
             <field name="name">project.phase.wkf</field>
             <field name="osv">project.phase</field>
@@ -104,5 +105,6 @@
             <field name="act_to" ref="act_draft"/>
             <field name="signal">set_draft</field>
         </record>
+
  	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index fb8a29449f7..5056cad3b77 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -25,4 +25,3 @@ import project_schedule_tasks
 import working_calendar
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index ce2e2c0bbb1..3b4ac2d7b23 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import datetime
 from resource.faces import *
 from new import classobj
@@ -48,6 +49,8 @@ class project_compute_phases(osv.osv_memory):
         return self.compute_date(cr, uid, ids, context=context)
 
     def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None):
+       if context is None:
+            context = {}
        """Schedule phase with the start date till all the next phases are completed.
 
        Arguements: start_dsate -- start date for the phase
@@ -118,7 +121,7 @@ class project_compute_phases(osv.osv_memory):
                                                    context=ctx)
             # Recursive call till all the next phases scheduled
             for phase in phase.next_phase_ids:
-               if phase.state in ['draft','open','pending']:
+               if phase.state in ['draft', 'open', 'pending']:
                    id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
                    self._phase_schedule(cr, uid, phase, date_start, id_cal, context=context)
                else:
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 6bbb01ca7e4..8a9ce15e772 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -9,20 +9,20 @@
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
               		<group width="380" height="180">
-	                  <group colspan="4" col="4">
-	                  <label colspan="4" string="This wizard will schedule phases for all or specified project" />
-	                  <newline />
-		              <field name="target_project" colspan="4"/>
-		              </group>
-		              <newline />
-		              <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}">
-		              		<field name="project_id"/>
-		              </group>
-		              <separator colspan="4"/>
-		              <group colspan="4" col="6"> <!-- Improve me -->
-		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/>
-		              </group>
+                        <group colspan="4" col="4">
+                            <label colspan="4" string="This wizard will schedule phases for all or specified project" />
+                            <newline />
+                            <field name="target_project" colspan="4"/>
+		                </group>
+                        <newline />
+                        <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}">
+                            <field name="project_id"/>
+                        </group>
+                        <separator colspan="4"/>
+                        <group colspan="4" col="6"> <!-- Improve me -->
+	                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+	                        <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/>
+                        </group>
 		            </group>
 			  	</form>
             </field>
@@ -35,7 +35,7 @@
 	           <field name="view_type">form</field>
 	           <field name="view_mode">form</field>
 	           <field name="view_id" ref="view_project_compute_phases_select"/>
-		       <field name="context">{'record_id' : active_id}</field>
+		       <field name="context">{'record_id': active_id}</field>
 	           <field name="target">new</field>
     	</record>
 
@@ -43,4 +43,4 @@
         	parent="menu_phase_schedule" action="action_project_compute_phases"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index bd569abf90e..f7f1c9dc613 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -69,7 +69,7 @@ class project_compute_tasks(osv.osv_memory):
                 resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)], context=context)
                 if resource_id:
 #                    resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
-                    resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0]
+                    resource = resource_obj.read(cr, uid, resource_id, ['calendar_id', 'time_efficiency'], context=context)[0]
                     if resource.get('calendar_id', False):
                        leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
                     time_efficiency = resource.get('time_efficiency')
@@ -126,7 +126,7 @@ class project_compute_tasks(osv.osv_memory):
                 s_date = t.start.to_datetime()
                 e_date = t.end.to_datetime()
                 if loop_no == 0:
-                    project_obj.write(cr, uid, [project_id], {'date' : e_date}, context=context)
+                    project_obj.write(cr, uid, [project_id], {'date': e_date}, context=context)
                 else:
                     ctx = context.copy()
                     ctx.update({'scheduler': True})
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index eff475b4f11..bf6fe379048 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -34,4 +34,4 @@
         	parent="menu_phase_schedule" action="action_project_compute_tasks"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 78ad2166698..f0ad7c51dae 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -40,6 +40,8 @@ class project_schedule_task(osv.osv_memory):
                 }
 
     def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
         self.compute_date(cr, uid, context=context)
         return res
@@ -70,6 +72,8 @@ class project_schedule_task(osv.osv_memory):
         return resource_objs
 
     def compute_date(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         """
         Schedule the tasks according to resource available and priority.
         """
@@ -152,7 +156,7 @@ class project_schedule_task(osv.osv_memory):
                                                                     'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
                                                                     'user_id': user_id[0]},
                                                                     context=ctx)
-                loop_no +=1
+                loop_no += 1
         return {}
 
 project_schedule_task()
diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
index b62a3c107d9..f8e2f2d828b 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
@@ -25,9 +25,9 @@
 	           <field name="view_type">form</field>
 	           <field name="view_mode">form</field>
 	           <field name="view_id" ref="view_project_schedule_tasks"/>
-		       <field name="context">{'record_id' : active_id}</field>
+		       <field name="context">{'record_id': active_id}</field>
 	           <field name="target">new</field>
     	</record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py
index ba8ec7db150..d52bd54b437 100644
--- a/addons/project_long_term/wizard/working_calendar.py
+++ b/addons/project_long_term/wizard/working_calendar.py
@@ -18,21 +18,27 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import datetime
 
 import pooler
 
-def convert_timeformat(cr, uid, time_string, context={}):
+def convert_timeformat(cr, uid, time_string, context=None):
+        if context is None:
+            context = {}
         """ Convert input time string: 8.5 to output time string 8:30."""
 
         split_list = str(time_string).split('.')
         hour_part = split_list[0]
         mins_part = split_list[1]
-        round_mins  = int(round(float(mins_part) * 60,-2))
+        round_mins = int(round(float(mins_part) * 60,-2))
         converted_string = hour_part + ':' + str(round_mins)[0:2]
         return converted_string
 
-def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=False, context={}):
+def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
+   
+        if context is None:
+            context = {}
 
         """Compute the leaves from the working calendar of the resource.
 
@@ -63,7 +69,10 @@ def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=Fa
             leave_list.sort()
         return leave_list
 
-def compute_working_calendar(cr, uid, calendar_id, context={}):
+def compute_working_calendar(cr, uid, calendar_id, context=None):
+
+        if context is None:
+            context = {}
 
         """Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
 
@@ -103,7 +112,7 @@ def compute_working_calendar(cr, uid, calendar_id, context={}):
         for k,v in wk_time.items():
             wktime_cal.append(tuple(v))
         # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
-        for k,v in wk_days.items():
+        for k, v in wk_days.items():
             if week_days.has_key(k):
                 week_days.pop(k)
         for v in week_days.itervalues():
@@ -111,4 +120,4 @@ def compute_working_calendar(cr, uid, calendar_id, context={}):
         if non_working:
             wktime_cal.append((non_working[:-1], time_range))
         return wktime_cal
-# 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/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 134b4cc80c2..eb2bc24dc7c 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -21,10 +21,10 @@
 
 
 {
-    "name" : "In-Project Messaging System",
-    "version" : "1.0",
-    "depends" : ["project"],
-    "author" : "Tiny",
+    "name": "In-Project Messaging System",
+    "version": "1.0",
+    "depends": ["project"],
+    "author": "Tiny",
     "description": """
     This module provides the functionality to send messages within a project.'
     A user can send messages individually to other user also he can broadcast
diff --git a/addons/project_messages/project_messages.py b/addons/project_messages/project_messages.py
index ab7f96b71d4..657405c0921 100644
--- a/addons/project_messages/project_messages.py
+++ b/addons/project_messages/project_messages.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 import netsvc
 
@@ -29,16 +30,15 @@ class messages(osv.osv):
     logger = netsvc.Logger()
 
     _columns = {
-        'from_id':fields.many2one('res.users', 'From', ondelete="CASCADE"),
-        'to_id':fields.many2one('res.users', 'To', ondelete="CASCADE"),
-        'project_id':fields.many2one('project.project', 'Project',
+        'from_id': fields.many2one('res.users', 'From', ondelete="CASCADE"),
+        'to_id': fields.many2one('res.users', 'To', ondelete="CASCADE"),
+        'project_id': fields.many2one('project.project', 'Project',
                                      required=True, ondelete="CASCADE"),
-        'message':fields.text('Message', required=True),
+        'message': fields.text('Message', required=True),
     }
-
     _defaults = {
-        'from_id':lambda self, cr, uid, context: uid,
-        'to_id':None,
+        'from_id': lambda self, cr, uid, context: uid,
+        'to_id': None,
     }
 
     def broadcast(self, cr, uid, project_id, message, context=None):
@@ -67,6 +67,7 @@ class project_with_message(osv.osv):
             'project.messages', 'project_id', 'Messages',
             domain="[('to_id','in',[uid,False])]"),
     }
+
 project_with_message()
 
-# 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/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index b310d99d87d..766b70ff911 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -21,4 +21,3 @@
 import mrp
 import project_mrp
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 98b05248a66..dc5d52e241d 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,35 +15,38 @@
 #    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/>.
 #
 ##############################################################################
 
 from osv import fields, osv, orm
+
 import tools
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
     _inherit = "procurement.order"
-    
-    def action_produce_assign_service(self, cr, uid, ids, context={}):
+
+    def action_produce_assign_service(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         for procurement in self.browse(cr, uid, ids):
             sline = self.pool.get('sale.order.line')
             content = ''
             sale_order = self.pool.get('sale.order')
             so_ref =  procurement.name.split(':')[0]
-            order_ids = sale_order.search(cr, uid, [('name','=',so_ref)], context)
+            order_ids = sale_order.search(cr, uid, [('name', '=', so_ref)], context)
 
             if order_ids:
-                sale_ids = sale_order.read(cr, uid, order_ids[0],['order_line'],context=context)['order_line']
+                sale_ids = sale_order.read(cr, uid, order_ids[0], ['order_line'], context=context)['order_line']
             else:
                 so_ref =  procurement.origin.split(':')[0]
-                sale_ids = sline.search(cr, uid, [('procurement_id','=',procurement.id)], context)
+                sale_ids = sline.search(cr, uid, [('procurement_id', '=',procurement.id)], context)
             l = None
             project_id = None
             analytic_account_id = False
             partner_id = False
-            
+
             for line in sline.browse(cr, uid, sale_ids, context=context):
                 content += (line.notes or '')
                 l = line
@@ -53,28 +56,28 @@ class procurement_order(osv.osv):
                     partner_id = line.order_id.partner_id.id
                     content+="\n\n"+line.order_id.project_id.complete_name
                     break
-            
+
             # Creating a project for task.Project is created from Procurement.
             project_obj = self.pool.get('project.project')
             proj_name = tools.ustr(so_ref)
-            proj_exist_id = project_obj.search(cr, uid, [('name','=',proj_name)], context=context)
+            proj_exist_id = project_obj.search(cr, uid, [('name', '=', proj_name)], context=context)
             if  not proj_exist_id:
-                project_id = project_obj.create(cr, uid, {'name':proj_name, 'partner_id':partner_id})
+                project_id = project_obj.create(cr, uid, {'name': proj_name, 'partner_id': partner_id})
             else:
                 project_id = proj_exist_id[0]
-                
-            self.write(cr, uid, [procurement.id], {'state':'running'})
-            
+
+            self.write(cr, uid, [procurement.id], {'state': 'running'})
+
             name_task = ('','')
             if procurement.product_id.type == 'service':
                 proc_name = procurement.name
                 if procurement.origin == proc_name:
                     proc_name = procurement.product_id.name
-                    
+
                 name_task = (procurement.origin, proc_name or '')
             else:
                 name_task = (procurement.product_id.name or procurement.origin, procurement.name or '')
-                
+
             task_id = self.pool.get('project.task').create(cr, uid, {
                 'name': '%s:%s' % name_task,
                 'date_deadline': procurement.date_planned,
@@ -90,8 +93,9 @@ class procurement_order(osv.osv):
                 'company_id': procurement.company_id.id,
                 'project_id': project_id,
             },context=context)
+
         return task_id
+
 procurement_order()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index b606bbfe8fa..09820d44c71 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -49,4 +49,4 @@ class project_task(osv.osv):
 
 project_task()
 
-# 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/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index cd242e7f699..751634816e3 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-    <record model="workflow.transition" id="procurement.trans_produce_service_make_done">
-        <field name="act_from" ref="procurement.act_produce_service"/>
-        <field name="act_to" ref="procurement.act_make_done"/>
-        <field name="signal">subflow.done</field>
-    </record>
-</data>
+    <data>
+        <record model="workflow.transition" id="procurement.trans_produce_service_make_done">
+            <field name="act_from" ref="procurement.act_produce_service"/>
+            <field name="act_to" ref="procurement.act_make_done"/>
+            <field name="signal">subflow.done</field>
+        </record>
+    </data>
 </openerp>
 
diff --git a/addons/project_planning/__init__.py b/addons/project_planning/__init__.py
index 8f933a8ce2e..3cf91b8b9f7 100644
--- a/addons/project_planning/__init__.py
+++ b/addons/project_planning/__init__.py
@@ -23,4 +23,3 @@ import project_planning
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
index 3dfbd250b31..b48ab78dec2 100644
--- a/addons/project_planning/board_project_planning_view.xml
+++ b/addons/project_planning/board_project_planning_view.xml
@@ -13,5 +13,6 @@
 			</xpath>
             </field>
         </record>"
+
     </data>
 </openerp>
diff --git a/addons/project_planning/i18n/ar.po b/addons/project_planning/i18n/ar.po
index 962c35e8ebc..7b5e3d7aa81 100644
--- a/addons/project_planning/i18n/ar.po
+++ b/addons/project_planning/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/bg.po b/addons/project_planning/i18n/bg.po
index 82ffba3fc43..8aa155cc1ff 100644
--- a/addons/project_planning/i18n/bg.po
+++ b/addons/project_planning/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 "символи!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Невалиден XML за преглед на архитектурата"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/bs.po b/addons/project_planning/i18n/bs.po
index bb7086bb9f5..d6b5f5d27bd 100644
--- a/addons/project_planning/i18n/bs.po
+++ b/addons/project_planning/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/ca.po b/addons/project_planning/i18n/ca.po
index 5d8b502d0ac..ad5670a98d0 100644
--- a/addons/project_planning/i18n/ca.po
+++ b/addons/project_planning/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Fins:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planificació per compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Resum per projecte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Qtat UdM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Estad. planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Posició"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Compte analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nom de model no vàlid en la definició de l'acció."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 "especial!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Estadístiques de planificació"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Estad. compte planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Hores planejades"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Real"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Les meves estadístiques de planificació"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planificació a partir de comptes analítics."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nom planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Quantitats"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Planificació RRHH"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Full d'assistència"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Línia de planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsable"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Quantitat"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Quantitats per compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Des de:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Temps per compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Data final"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML invàlid per a la definició de la vista!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Temps per usuari"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Estadístiques de planificació dels meus projectes"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Planificació actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Resum per usuari"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Anàlisis"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Anàlisis"
 msgid "User"
 msgstr "Usuari"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projecte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Total full de serveis"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Detall del temps de l'usuari per projectes"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Estad. planificació de l'usuari"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planificat"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Anàlisis planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Línies planificació"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Informes - Planificació analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "La meva planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planificació per usuari"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Nota"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Tasques"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planificació per compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Quantitats per usuari"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "La meva planificació actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Compte analític"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Director"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Director"
 msgid "Planning"
 msgstr "Planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Realitzat"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Total planejat"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Data inicial"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Estadístiques de planificació"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Obert"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nova planificació"
diff --git a/addons/project_planning/i18n/cs.po b/addons/project_planning/i18n/cs.po
index 962c35e8ebc..7b5e3d7aa81 100644
--- a/addons/project_planning/i18n/cs.po
+++ b/addons/project_planning/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po
index 381fca648ac..8e9bcc39199 100644
--- a/addons/project_planning/i18n/de.po
+++ b/addons/project_planning/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "An:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planung nach Konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Zeiten nach Projekt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Anzahl UoM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Verantwortlich"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Auswertung Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Analytisches Konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 "beinhalten"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Auswertung Plandaten"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Auswertung Planung Analysekonto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Geplante Stunden"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Real"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Auswertungen Meiner Planung"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planung für Analyse Konten"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Bezeichnung Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Mengen"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Personalplanung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Zeiterfassung"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Planungspositionen"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Verantwortlich:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Menge"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Mengen nach Konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Von Datum:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Zeiten nach Analysekonten"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Endedatum"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Zeiten nach Benutzer"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Meine Projekte Plan - Ist Vergleich"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Laufened Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Gesamtsumme nach Benutzer"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analyse der Plandaten"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Analyse der Plandaten"
 msgid "User"
 msgstr "Benutzer"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projektportal"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Gesamte Zeiterfassung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Details der Zeitaufwendungen nach Benutzern"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Auswertungen nach Benutzer"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Geplante Aufgaben"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Analyse Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Planungspositionen"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Analyse Planung - Berichte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Meine Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planung nach Benutzer"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Bemerkung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planung nach Konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Mengen nach Benutzer"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Meine laufende Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Analytisches Konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Manager"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Manager"
 msgid "Planning"
 msgstr "Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Erledigt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Gesamtsumme Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Startdatum"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Auswertungen Planung"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Offen"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Neue Planung"
diff --git a/addons/project_planning/i18n/el.po b/addons/project_planning/i18n/el.po
index f2948fdea3a..b93c5c7dcd6 100644
--- a/addons/project_planning/i18n/el.po
+++ b/addons/project_planning/i18n/el.po
@@ -2,7 +2,7 @@
 # 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.
-#
+#	* project_planning
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
@@ -17,52 +17,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Έως:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Σχεδίαση κατα Λογαριασμό"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Περίληψη κατα έργο"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Ποσότητα 1ης ΜΜ"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Υπεύθυνος"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Στατιστική Σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Κατάσταση"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Αναλυτικός λογαριασμός"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -70,129 +70,129 @@ msgstr ""
 "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
 "ειδικούς χαρακτήρες!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Στατιστικά Σχεδιασμού"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Στατιστική λογαριασμού σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Μελετημένες Ώρες"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Πραγματικό"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Οι Στατιστικές Σχεδιασμού Μου"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Σχεδιασμός στους αναλυτικούς λογαριασμούς."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Όνομα Σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Ποσότητες"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Σχεδιασμός Ανθρώπινου Δυναμικού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Χρονοδιάγραμμα"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Γραμμή Σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Υπεύθυνος:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Ποσότητα"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Ποσότητες κατα Λογαριασμό"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Από:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Χρόνος κατα Λογαριασμό"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Ημερομηνία Λήξης"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Χρόνος κατα Χρήστη"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Στατιστική Σχεδιασμού των Έργων Μου"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Τρέχοντες Σχεδιασμοί"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Περίληψη κατα χρήστη"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Ανάλυση"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -200,113 +200,113 @@ msgstr "Ανάλυση"
 msgid "User"
 msgstr "Χρήστης"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Έργο"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Σύνολο Χρονοδιαγράμματος"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Λεπτομέρειες του χρόνου χρήστη κατα έργα"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Στατιστική Σχεδιασμού Χρήστη"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Σχεδιασμένο"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Ανάλυση Σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Γραμμές σχεδιασμού"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Σχεδιασμός Αναλυτικής - Αναφορές"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Οι Σχεδιασμοί Μου"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Σχεδιασμοί κατα χρήστη"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Σημείωση"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Σχεδιασμοί κατα λογαριασμό"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Ποσότητες κατα Χρήστη"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Οι τρέχοντες σχεδιασμοί μου"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Αναλυτικός Λογαριασμός"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Διαχειριστής"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -315,33 +315,33 @@ msgstr "Διαχειριστής"
 msgid "Planning"
 msgstr "Σχεδιασμός"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Εκπληρωμένο"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Συνολικός Σχεδιασμός"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Ημερομηνία Έναρξης"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Στατιστικά Σχεδιασμού"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Ανοιχτό"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Νέος Σχεδιασμός"
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
index a78d24e8df9..436af0e484b 100644
--- a/addons/project_planning/i18n/es.po
+++ b/addons/project_planning/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Hasta:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planificación por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Resumen por proyecto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Ctdad UdM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Estad. planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Cuenta analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Estadísticas de planificación"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Estad. cuenta planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Horas planeadas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Real"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Mis estadísticas de planificación"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planificación a partir de cuentas analíticas."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nombre planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Cantidades"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Planificación RRHH"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Hoja de asistencia"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Línea de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsable:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Cantidades por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Desde:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Tiempo por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "¡XML inválido para la definición de la vista!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Tiempo por usuario"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Estadísticas de planificación de mis proyectos"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Planificación actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Resumen por usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Análisis"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Análisis"
 msgid "User"
 msgstr "Usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Proyecto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Total hoja de servicios"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Detalle del tiempo del usuario por proyectos"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Estad. planificación del usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planificado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Análisis planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Líneas planificación"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Informes - Planificación analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Mi planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planificación por usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Nota"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Tareas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planificación por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Cantidades por usuario"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Mi planificación actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Responsable"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Responsable"
 msgid "Planning"
 msgstr "Planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Realizado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Total planeado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Estadísticas de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nueva planificación"
diff --git a/addons/project_planning/i18n/es_AR.po b/addons/project_planning/i18n/es_AR.po
index 19e6534bded..1df87c160f8 100644
--- a/addons/project_planning/i18n/es_AR.po
+++ b/addons/project_planning/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Hasta:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planificación por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Resumen por proyecto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Ctdad UdM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Estad. planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Cuenta analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Estadísticas de planificación"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Estad. cuenta de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Horas planeadas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Real"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Mis estadísticas de planificación"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planificación en cuentas analíticas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nombre planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Cantidades"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Planificación de RRHH"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Hoja de tareas"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Línea de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsable:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Cantidad"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Cantidades por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "De:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Tiempo por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Fecha de fin"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML inválido para la definición de la vista !"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Tiempo por usuario"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Estadísticas de planificación de mis proyectos"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Planificación actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Resumen por usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Análisis"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Análisis"
 msgid "User"
 msgstr "Usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Proyecto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Total hoja de tareas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Detalle del tiempo del usuario por proyectos"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Estad. planificación del usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planificado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Análisis de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Líneas de planificación"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Planificación analítica - Informes"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Mi planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planificación por usuario"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Nota"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Tareas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planificación por cuenta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Cantidades por usuario"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Mi planificación actual"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Gerente"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Gerente"
 msgid "Planning"
 msgstr "Planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Realizado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Total planeado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Estadísticas de planificación"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nueva planificación"
diff --git a/addons/project_planning/i18n/et.po b/addons/project_planning/i18n/et.po
index 9219f78e8c8..47408b24777 100644
--- a/addons/project_planning/i18n/et.po
+++ b/addons/project_planning/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Kellele:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planeerimine Kontokohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Summaarselt Projektikohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Mõõtühikute kogus"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Vastutav"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Planeerimine viivitamatult"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Staatus"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Analüütiline konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Plaanimise Statistika"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Planeerimise konto viivitamatult"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Planeeritud tunnid"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Reaalne"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Minu Plaanidide Statistikad"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planeerimine analüütilistel kontodel."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Planeerimise Nimi"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Kogused"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "HR Planeerimine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Ajagraafik"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Plaanimise Rida"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Vastutaja:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Kogus"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Kogused Kontokohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Alates:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Aeg Kontokohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Vigane XML vaate arhitektuurile!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Aeg Kasutajakohta"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Minu Projektide Planeerimise statistika"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Käesolev planeerimine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Summaarselt kasutajakohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analüüs"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr "Analüüs"
 msgid "User"
 msgstr "Kasutaja"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projekt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Kokku Ajagraafik"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Detailselt kasutajate aeg projektikohta"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Planeerimine kasutaja viivitamatult"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planeeritud"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Planeerimise analüüs"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Planeerimise read"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Analüütiline planeerimine - Aruandlus"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Minu planeerimine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planeerimine kasutajakohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Märkus"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planeerimine kontokohta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Kogused kasutajakohta"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Minu käesolev plnaaerimine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Haldur"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr "Haldur"
 msgid "Planning"
 msgstr "Planeerimine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Tehtud"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Kokku Planeeritud"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Planeerimise statistika"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Avatud"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Uus Planeerimine"
diff --git a/addons/project_planning/i18n/fr.po b/addons/project_planning/i18n/fr.po
index ba4529ac344..d705a372f1c 100644
--- a/addons/project_planning/i18n/fr.po
+++ b/addons/project_planning/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "A:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planning par Compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Résumé par projet"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Qté UoM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "responsible"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Planning statistiques"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "État"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Compte analytique"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
 "spéciaux !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Statistiques des Plannings"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Planning par compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Heures planifiées"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Réel"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Mes Statistiques de Planning"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nom du planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Quantités"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Planning RH"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Feuille de présence"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Ligne de planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsable:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Quantité"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Quantités par Compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "De:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Temps par COmpte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Date de fin"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Temps par Utilisateur"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Statistiques des Plannings de mes Projets"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Résumé par utilisateur"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analyses"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Analyses"
 msgid "User"
 msgstr "Utilisateur"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projet"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Total des feuilles de présence"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Détails du temps d'utilisateur par projets"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Planning par utilisateur"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planifié"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Analyse planifiée"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Ligne planifiées"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planning par utilisateur"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Note"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Tâches"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planning par compte"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Quantités par Utilisateur"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Compte analytique"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Gestionnaire"
 msgid "Planning"
 msgstr "Planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Terminé"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Total Plannifié"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Date de début"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Statistiques du planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Ouvert"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nouveau Planning"
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index 85f8bfa608c..38dcc13a323 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/hu.po b/addons/project_planning/i18n/hu.po
index 962c35e8ebc..7b5e3d7aa81 100644
--- a/addons/project_planning/i18n/hu.po
+++ b/addons/project_planning/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/id.po b/addons/project_planning/i18n/id.po
index 7e21234df51..62a5088b4e9 100644
--- a/addons/project_planning/i18n/id.po
+++ b/addons/project_planning/i18n/id.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/it.po b/addons/project_planning/i18n/it.po
index 2fcc012f916..49740c9172a 100644
--- a/addons/project_planning/i18n/it.po
+++ b/addons/project_planning/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "A:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Pianificazione da Contabilità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Cronologia per Progetto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Quantità UoM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Responsabile"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Statistiche Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Stato"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Contabilità Analitica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Statistiche di Pianificazione"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Statistiche per Pianificazione da Contabilità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Ore Pianificate"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Reale"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Statistiche da Le Mie Pianificazioni"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nome Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Quantità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Pianificazione Risorse Umane"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Orario"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Riga Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsabile:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Quantità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Quantità da Contabilità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Da:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Ore da Contabilità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Data di fine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valido per Visualizzazione Architettura!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Ore per Utente"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Statistiche di Pianificazione su I Miei Progetti"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Cronologia per Utente"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analisi"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Analisi"
 msgid "User"
 msgstr "Utente"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Progetto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Orari Totali"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Dettaglio Ore Utente per Progetti"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Statistiche Pianificazioni Utente"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Pianificato"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Analisi Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Righe Pianificazione"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Pianificazione per Utente"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Nota"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Attività"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Pianificazione da Contabilità"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Quantità per Utente"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Contabilità Analitica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Responsabile"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Responsabile"
 msgid "Planning"
 msgstr "Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Completato"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Totale Pianificato"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Data di inizio"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Statistiche di Pianificazione"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Aperto"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nuova Pianificazione"
diff --git a/addons/project_planning/i18n/ko.po b/addons/project_planning/i18n/ko.po
index 325e58f61b5..20bd4ebedd4 100644
--- a/addons/project_planning/i18n/ko.po
+++ b/addons/project_planning/i18n/ko.po
@@ -2,6 +2,7 @@
 # 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.
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -17,180 +18,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +199,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +314,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/ko_KO.po b/addons/project_planning/i18n/ko_KO.po
index e7e52cffb78..51973185715 100644
--- a/addons/project_planning/i18n/ko_KO.po
+++ b/addons/project_planning/i18n/ko_KO.po
@@ -2,6 +2,7 @@
 # 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.
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -17,180 +18,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-08-28 10:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +199,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +314,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/lt.po b/addons/project_planning/i18n/lt.po
index 962c35e8ebc..7b5e3d7aa81 100644
--- a/addons/project_planning/i18n/lt.po
+++ b/addons/project_planning/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/nl.po b/addons/project_planning/i18n/nl.po
index 26486fa9884..7be6d2e995f 100644
--- a/addons/project_planning/i18n/nl.po
+++ b/addons/project_planning/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Aan:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planning per account"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Samenvatting per project"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Hoev ME"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Verantwoordelijke"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Planning stat"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Kostenplaats"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de definitie van de actie."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 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 !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Planning statistieken"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Geplande uren"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Werkelijk"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planning op kostenplaatsen."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Planningsnaam"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Hoeveelheden"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "HR planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Urenstaat"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Planning regel"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Verantwoordelijke:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Hoeveelheden per account"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Van:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Tijd per account"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Einddatum"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor weergave!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Tijd per gebruiker"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Planning statistieken van mijn projecten"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Huidige planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Samenvatting per gebruiker"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analyse"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr "Analyse"
 msgid "User"
 msgstr "Gebruiker"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Project"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Totaal urenoverzicht"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Details van tijd per gebruiker naar project"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Stat planning gebruiker"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Gepland"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Planningsanalyse"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Planningsregels"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Analytische planning- Overzichten"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Mijn planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planning per gebruiker:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Opmerking"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Taken"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planning per account"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Hoeveelheden per gebruiker"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Mijn huidige planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Kostenplaats"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Manager"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr "Manager"
 msgid "Planning"
 msgstr "Planning"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Verwerkt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Totaal gepland"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Startdatum"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Planning statistieken"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Open"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nieuwe planning"
diff --git a/addons/project_planning/i18n/nl_BE.po b/addons/project_planning/i18n/nl_BE.po
index 8ea74bdb8aa..9cf7bd435b1 100644
--- a/addons/project_planning/i18n/nl_BE.po
+++ b/addons/project_planning/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 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 !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/pl.po b/addons/project_planning/i18n/pl.po
index cccf765958a..58700caad9e 100644
--- a/addons/project_planning/i18n/pl.po
+++ b/addons/project_planning/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-24 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Do:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planowanie wg kont"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Il. JM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Odpowiedzialny"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Stan"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Konto analityczne"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 "specjalnych !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Statystyki planowania"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Planowane godziny"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Rzeczywiste"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Moje statystyki planowania"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr "Planowanie wg kont analitycznych"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nazwa planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Ilości"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Karta czasu pracy"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Pozycja planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Odpowiedzialna(y):"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Ilość"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Ilości wg kont"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Od:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Czas wg kont"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Data końcowa"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Czas wg użytkownika"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Statystyki planowania dla moich projektów"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr "Bieżące planowanie"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analiza"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr "Analiza"
 msgid "User"
 msgstr "Użytkownik"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projekt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Suma karty czasu pracy"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planowane"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Analiza planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Pozycje planowania"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr "Planowanie analityczne - Raportowanie"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr "Moje planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planowanie wg użytkownika"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Uwaga"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Zadania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planowanie wg kont"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Ilości wg użytkowników"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr "Moje bieżące planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Menedżer"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr "Menedżer"
 msgid "Planning"
 msgstr "Planowanie"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Wykonano"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Data początkowa"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Statystyka planowania"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Otwarte"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nowe planowanie"
diff --git a/addons/project_planning/i18n/pt.po b/addons/project_planning/i18n/pt.po
index c4a59166c04..6531f597416 100644
--- a/addons/project_planning/i18n/pt.po
+++ b/addons/project_planning/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Para:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Planeamento por contas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Sumário por projectos"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Quantidade de UdM"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Stado do planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Conta da contabilidade analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Estatísticas do planeamento"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Estado do planeamento da conta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Horas planeadas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Real"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Minhas estatísticas do planeamento"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Nome do planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Quantidades"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Planeamento dos RH"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Horário"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Linha de planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Responsável:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Quantidade"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr "Quantidades por conta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "De:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr "Tempo por contas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Data de Finalização"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML inválido para a arquitectura de vista"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr "Tempo por utilizador"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Estatísticas do planeamento de meus projectos"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Sumário por utilizador"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Análise"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr "Análise"
 msgid "User"
 msgstr "Utilizador"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projecto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr "Horário total"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Detalhes do tempo dos utilizadores por projecto"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Estado do planeamento do utilizador"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Planeado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Análise de planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Linhas de planeamento"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Planeamento por utilizador"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Nota"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Tarefas"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Planeamento por conta"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr "Quantidades por utilizador"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Conta da contabilidade analítica"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Gestor"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr "Gestor"
 msgid "Planning"
 msgstr "Planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Concluído"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Total planeado"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Data de Início"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Estatísticas do planeamento"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Aberto"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Novo planeamento"
diff --git a/addons/project_planning/i18n/pt_BR.po b/addons/project_planning/i18n/pt_BR.po
index b0403112975..fca7f3840b8 100644
--- a/addons/project_planning/i18n/pt_BR.po
+++ b/addons/project_planning/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 "especial!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Invalido XML para Arquitetura da View"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/report_analytic_planning.pot b/addons/project_planning/i18n/report_analytic_planning.pot
index e6542971817..384ebfa0524 100644
--- a/addons/project_planning/i18n/report_analytic_planning.pot
+++ b/addons/project_planning/i18n/report_analytic_planning.pot
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -15,179 +15,179 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -195,113 +195,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -310,34 +310,34 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
 
diff --git a/addons/project_planning/i18n/ro.po b/addons/project_planning/i18n/ro.po
index 962c35e8ebc..7b5e3d7aa81 100644
--- a/addons/project_planning/i18n/ro.po
+++ b/addons/project_planning/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/ru.po b/addons/project_planning/i18n/ru.po
index 65ddf5d5a44..e180ee408a9 100644
--- a/addons/project_planning/i18n/ru.po
+++ b/addons/project_planning/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,52 +16,52 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Для:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Планирование по счетам"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "Кол-во ед.изм."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Ответственный"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Начало планирования"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Счет аналитики"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -69,129 +69,129 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Реально"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -199,113 +199,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Анализ планирования"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -314,33 +314,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/sl.po b/addons/project_planning/i18n/sl.po
index b2f3be033a9..9225d765a0e 100644
--- a/addons/project_planning/i18n/sl.po
+++ b/addons/project_planning/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Za:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr "Načrtovanje po konih"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Povzetek po projektu"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Odgovoren"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr "Stanje"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Analitični konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Napačno ime modela v definiciji dejanja."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 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."
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Načrtovane ure"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Dejansko"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Količine"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Časovnica"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Odgovorni:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Količina"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Od:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr "Končni datum"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Neveljaven XML za arhitekturo pogleda."
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Analiza"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr "Analiza"
 msgid "User"
 msgstr "Uporabnik"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Projekt"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Načrtovano"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Opomba"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Opravila"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Analitični konto"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Upravitelj"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr "Upravitelj"
 msgid "Planning"
 msgstr "Načrtovanje"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Zaključeno"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr "Skuap načrtovano"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr "Datum začetka"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Odpri"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/sq.po b/addons/project_planning/i18n/sq.po
index bc56185740d..7d6ba289d9c 100644
--- a/addons/project_planning/i18n/sq.po
+++ b/addons/project_planning/i18n/sq.po
@@ -1,7 +1,7 @@
 # Translation of OpenERP Server.
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,179 +16,179 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -196,113 +196,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -311,34 +311,34 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
 
@@ -358,179 +358,179 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -538,113 +538,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -653,34 +653,34 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
 
diff --git a/addons/project_planning/i18n/sv.po b/addons/project_planning/i18n/sv.po
index 37b5a0612d9..6cc0f954222 100644
--- a/addons/project_planning/i18n/sv.po
+++ b/addons/project_planning/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 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!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/tlh.po b/addons/project_planning/i18n/tlh.po
index ad852f78a66..a4d2e8c3fd1 100644
--- a/addons/project_planning/i18n/tlh.po
+++ b/addons/project_planning/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
index 4618995c803..15c3e2643ec 100644
--- a/addons/project_planning/i18n/tr.po
+++ b/addons/project_planning/i18n/tr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/uk.po b/addons/project_planning/i18n/uk.po
index ecf8df6b4bc..fa0ee06b31b 100644
--- a/addons/project_planning/i18n/uk.po
+++ b/addons/project_planning/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,181 +16,181 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr "Для:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr "Всього за проектом"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr "ОВ к-сті"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr "Відповідальний"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr "Статистика планування"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr "Аналітичний рахунок"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr "Статистика планування"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr "Статистика планування за рахунком"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr "Заплановано годин"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr "Реальний"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr "Статистика мого планування"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr "Назва планування"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr "Кількості"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr "Планування Персоналу"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr "Табель"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr "Рядок планування"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr "Відповідальний:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr "Кількість"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr "Від:"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильний XML для Архітектури Вигляду!"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr "Статистика планування моїх проектів"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr "Всього по користувачу"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr "Аналіз"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -198,113 +198,113 @@ msgstr "Аналіз"
 msgid "User"
 msgstr "Користувач"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr "Проект"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr "Деталі часу користувача по проектах"
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr "Статистика планування користувача"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr "Планується"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr "Аналіз планування"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr "["
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr "Рядки планування"
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr "]"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr "Планування за користувачем"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr "Примітка"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr "Завдання"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr "Планування за рахунком"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr "Аналітичний рахунок"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr "Менеджер"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -313,33 +313,33 @@ msgstr "Менеджер"
 msgid "Planning"
 msgstr "Планування"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr "Виконано"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr "Планова статистика"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr "Відкрито"
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/vi.po b/addons/project_planning/i18n/vi.po
index d9e3b8da15e..2e2a2499a92 100644
--- a/addons/project_planning/i18n/vi.po
+++ b/addons/project_planning/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of OpenERP Server.
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,179 +16,179 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -196,113 +196,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -311,34 +311,34 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
 
@@ -358,179 +358,179 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -538,113 +538,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -653,34 +653,34 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
 
diff --git a/addons/project_planning/i18n/zh_CN.po b/addons/project_planning/i18n/zh_CN.po
index e7d06c06e06..f3063a11151 100644
--- a/addons/project_planning/i18n/zh_CN.po
+++ b/addons/project_planning/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/i18n/zh_TW.po b/addons/project_planning/i18n/zh_TW.po
index e7d06c06e06..f3063a11151 100644
--- a/addons/project_planning/i18n/zh_TW.po
+++ b/addons/project_planning/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
+#	* project_planning
 #
 msgid ""
 msgstr ""
@@ -16,180 +16,180 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-12-16 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
 msgid "Planning on analytic accounts."
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,user_id:0
@@ -197,113 +197,113 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Analytic planning - Reporting"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
-#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
-#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: model:ir.ui.menu,name:project_planning.planning_main
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.line,planning_id:0
 #: field:report_account_analytic.planning.stat,planning_id:0
@@ -312,33 +312,33 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
 msgstr ""
 
-#. module: report_analytic_planning
+#. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
 msgstr ""
 
-#. module: report_analytic_planning
-#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr ""
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 23fb780f334..260113016cb 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -20,16 +20,17 @@
 #
 ##############################################################################
 
+import time
+import mx.DateTime
+
 from osv import fields, osv
 from tools.translate import _
 
-import time
-import mx.DateTime
 
 class one2many_mod3(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
         if not context:
-            context = {}
+            context = context
         res = {}
         for obj in obj.browse(cr, user, ids, context=context):
             res[obj.id] = []
@@ -48,7 +49,7 @@ class report_account_analytic_planning(osv.osv):
     _name = "report_account_analytic.planning"
     _description = "Planning"
 
-    def _get_total_planned(self, cr, uid, ids, name, args, context):
+    def _get_total_planned(self, cr, uid, ids, name, args, context=None):
         result = {}
         for plan in self.browse(cr, uid, ids, context):
             plan_hrs=0.0
@@ -59,7 +60,7 @@ class report_account_analytic_planning(osv.osv):
             result[plan.id] = plan_hrs
         return result
 
-    def _get_total_free(self, cr, uid, ids, name, args, context):
+    def _get_total_free(self, cr, uid, ids, name, args, context=None):
         result = {}
         for plan in self.browse(cr, uid, ids, context):
             total_free = 0.0
@@ -69,7 +70,9 @@ class report_account_analytic_planning(osv.osv):
             result[plan.id] = total_free
         return result
 
-    def _check_planning_responsible(self, cr, uid, ids, context={}):
+    def _check_planning_responsible(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         for obj_plan in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT id FROM report_account_analytic_planning plan
@@ -92,23 +95,23 @@ class report_account_analytic_planning(osv.osv):
         'name': fields.char('Planning Name', required=True, size=32, states={'done':[('readonly', True)]}),
         'code': fields.char('Code', size=32, states={'done':[('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done':[('readonly', True)]}),
-        'date_from':fields.date('Start Date', required=True, states={'done':[('readonly', True)]}),
+        'date_from': fields.date('Start Date', required=True, states={'done':[('readonly', True)]}),
         'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
         'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
         'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open', 'Open'), ('done', 'Done'),('cancel','Cancelled')], 'Status', required=True),
-        'business_days' : fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True),
+        'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
-        'total_planned'  : fields.function(_get_total_planned, method=True, string='Total Planned'),
-        'total_free'  : fields.function(_get_total_free, method=True, string='Total Free'),
+        'total_planned': fields.function(_get_total_planned, method=True, string='Total Planned'),
+        'total_free': fields.function(_get_total_free, method=True, string='Total Free'),
     }
     _defaults = {
-        'date_from': lambda *a: time.strftime('%Y-%m-01'),
-        'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
+        'date_from': time.strftime('%Y-%m-01'),
+        'date_to': (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
         'user_id': lambda self, cr, uid, c: uid,
-        'state': lambda *args: 'draft',
-        'business_days' : lambda *a: 20,
+        'state': 'draft',
+        'business_days': 20,
     }
     _order = 'date_from desc'
 
@@ -116,19 +119,27 @@ class report_account_analytic_planning(osv.osv):
         (_check_planning_responsible, 'Invalid planning ! Planning dates can\'t overlap for the same responsible. ', ['user_id'])
     ]
 
-    def action_open(self, cr, uid, id, context={}):
+    def action_open(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, id, {'state' : 'open'}, context=context)
         return True
 
-    def action_cancel(self, cr, uid, id, context={}):
+    def action_cancel(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
         return True
 
-    def action_draft(self, cr, uid, id, context={}):
+    def action_draft(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, id, {'state' : 'draft'}, context=context)
         return True
 
-    def action_done(self, cr, uid, id, context={}):
+    def action_done(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, id, {'state' : 'done'}, context=context)
         return True
 
@@ -139,10 +150,12 @@ class report_account_analytic_planning_line(osv.osv):
     _description = "Planning Line"
     _rec_name = 'user_id'
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['user_id','planning_id','note'], context)
+        reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context)
         res = []
         for record in reads:
             name = '['+record['planning_id'][1]
@@ -155,7 +168,9 @@ class report_account_analytic_planning_line(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _amount_base_uom(self, cr, uid, ids, name, args, context):
+    def _amount_base_uom(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
@@ -168,7 +183,7 @@ class report_account_analytic_planning_line(osv.osv):
         return result
 
     _columns = {
-        'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic account', required=True),
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
         'user_id': fields.many2one('res.users', 'User'),
         'amount': fields.float('Quantity', required=True),
@@ -177,7 +192,7 @@ class report_account_analytic_planning_line(osv.osv):
         'amount_in_base_uom': fields.function(_amount_base_uom, method=True, string='Quantity in base uom', store=True),
         'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'),
     }
-    _order = 'user_id,account_id'
+    _order = 'user_id, account_id'
 
 report_account_analytic_planning_line()
 
@@ -199,7 +214,7 @@ class project_task(osv.osv):
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if not context:
-            context = {}
+            context = context
         if not context.get('planning'):
             return super(project_task,self).search(cr, user, args, offset, limit, order, context)
         cr.execute(" SELECT t.id, t.name \
@@ -211,15 +226,15 @@ class project_task(osv.osv):
 
 project_task()
 
-
 class report_account_analytic_planning_user(osv.osv):
     _name = "report_account_analytic.planning.user"
     _description = "Planning by User"
     _rec_name = 'user_id'
     _auto = False
 
-
-    def _get_tasks(self, cr, uid, ids, name, args, context):
+    def _get_tasks(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
@@ -243,7 +258,9 @@ class report_account_analytic_planning_user(osv.osv):
                 result[line.id] = 0
         return result
 
-    def _get_free(self, cr, uid, ids, name, args, context):
+    def _get_free(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         result = {}
         for line in self.browse(cr, uid, ids, context):
             if line.user_id:
@@ -252,7 +269,9 @@ class report_account_analytic_planning_user(osv.osv):
                 result[line.id] = 0.0
         return result
 
-    def _get_timesheets(self, cr, uid, ids, name, args, context):
+    def _get_timesheets(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
@@ -275,9 +294,9 @@ class report_account_analytic_planning_user(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
         'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'),
-        'free' : fields.function(_get_free, method=True, string='Unallocated Time', readonly=True,help='Computed as \
+        'free': fields.function(_get_free, method=True, string='Unallocated Time', readonly=True, help='Computed as \
 Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'),
         'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'),
         'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'),
@@ -361,7 +380,9 @@ class report_account_analytic_planning_account(osv.osv):
     _rec_name = 'account_id'
     _auto = False
 
-    def _get_tasks(self, cr, uid, ids, name, args, context):
+    def _get_tasks(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
@@ -386,7 +407,9 @@ class report_account_analytic_planning_account(osv.osv):
             result[line.id] = cr.fetchall()[0][0] / div * div2
         return result
 
-    def _get_timesheets(self, cr, uid, ids, name, args, context):
+    def _get_timesheets(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
@@ -409,10 +432,10 @@ class report_account_analytic_planning_account(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
-        'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
-        'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
-        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet',help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
+        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
+        'plan_open': fields.float('Time Allocation without Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
+        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
     }
 
     def init(self, cr):
@@ -448,7 +471,6 @@ class report_account_analytic_planning_account(osv.osv):
         )
         """)
 
-
 report_account_analytic_planning_account()
 
 class report_account_analytic_planning_stat(osv.osv):
@@ -459,7 +481,9 @@ class report_account_analytic_planning_stat(osv.osv):
     _log_access = False
     _order = 'planning_id,user_id'
 
-    def _sum_amount_real(self, cr, uid, ids, name, args, context):
+    def _sum_amount_real(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
@@ -469,15 +493,17 @@ class report_account_analytic_planning_stat(osv.osv):
             div2 = 1.0
         for line in self.browse(cr, uid, ids, context):
             if line.user_id:
-                cr.execute('''select sum(acc.unit_amount/uom.factor) from account_analytic_line acc
+                cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc
                 LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
+WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             else:
-                cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
+                cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             result[line.id] = cr.fetchone()[0] * div2
         return result
 
-    def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
+    def _sum_amount_tasks(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
@@ -496,12 +522,12 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
                 where = 'user_id=' + str(line.user_id.id) + ' and '
             cr.execute('''select
                     sum(planned_hours)
-                from
+                FROM
                     project_task
-                where
+                WHERE
                 ''' + where + '''
-                    project_id in (select id from project_project where category_id=%s) and
-                    date_close>=%s and
+                    project_id IN (select id from project_project where category_id=%s) AND
+                    date_close>=%s AND
                     date_close<=%s''', (
                 line.account_id.id,
                 line.planning_id.date_from,
@@ -523,23 +549,24 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
     def init(self, cr):
         cr.execute("""
             create or replace view report_account_analytic_planning_stat as (
-                select
+                SELECT
                     min(l.id) as id,
                     l.user_id as user_id,
                     a.user_id as manager_id,
                     l.account_id as account_id,
                     sum(l.amount/u.factor) as sum_amount,
                     l.planning_id
-                from
+                FROM
                     report_account_analytic_planning_line l
-                left join
+                LEFT JOIN
                     report_account_analytic_planning a on (a.id = l.planning_id)
-                left join
+                LEFT JOIN
                     product_uom u on (l.amount_unit = u.id)
-                group by
+                GROUP BY
                     l.planning_id, l.user_id, l.account_id, a.user_id
             )
         """)
+
 report_account_analytic_planning_stat()
 
 class res_company(osv.osv):
@@ -547,9 +574,8 @@ class res_company(osv.osv):
     _columns = {
         'planning_time_mode_id': fields.many2one('product.uom', 'Planning Time Unit',
             help='This will set the unit of measure used in plannings.',
-
         ),
     }
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_planning/report/__init__.py b/addons/project_planning/report/__init__.py
index e68279cad8d..9a6ca02408e 100644
--- a/addons/project_planning/report/__init__.py
+++ b/addons/project_planning/report/__init__.py
@@ -19,6 +19,4 @@
 #
 ##############################################################################
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_retro_planning/__init__.py b/addons/project_retro_planning/__init__.py
index f8b889e85d7..1cad9d6fd91 100644
--- a/addons/project_retro_planning/__init__.py
+++ b/addons/project_retro_planning/__init__.py
@@ -20,4 +20,3 @@
 ##############################################################################
 import project_retro_planning
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index e53b6b01233..aa0b106bbad 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Project Retro planning',
     'version': '0.1',
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index f5f267875ca..5d2817349d4 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index 34272791f96..48244b49d67 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -19,12 +19,14 @@
 #
 ##############################################################################
 
-from datetime import date,timedelta,datetime
+from datetime import date, timedelta, datetime
 import time
+
 from osv import fields, osv
 
 class project_project(osv.osv):
     _inherit = 'project.project'
+
     def write(self, cr, uid, ids,vals, *args, **kwargs):
         if 'date' in vals and vals['date']:
             data_project = self.browse(cr, uid, ids)
@@ -43,4 +45,3 @@ class project_project(osv.osv):
 
 project_project()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
index 4d23d3c1a90..ceae2d0185a 100644
--- a/addons/project_timesheet/__init__.py
+++ b/addons/project_timesheet/__init__.py
@@ -22,4 +22,3 @@ import project_timesheet
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index d87bb7eb2fc..009d83a03fd 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Project Timesheet',
     'version': '1.0',
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index bfabe6ba5ad..adf4d197e40 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -39,7 +39,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-
          <!--
             Process Transition
         -->
@@ -71,7 +70,5 @@
             <field model="process.node" name="source_node_id" ref="project.process_node_donetask0"/>
         </record>
 
-
-
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 44e9048f253..e125ccbe784 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -93,6 +93,8 @@ class project_work(osv.osv):
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         vals_line = {}
         obj = self.pool.get('hr.analytic.timesheet')
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
@@ -152,7 +154,9 @@ class task(osv.osv):
 
         return super(task,self).unlink(cr, uid, ids, *args, **kwargs)
 
-    def write(self, cr, uid, ids,vals,context={}):
+    def write(self, cr, uid, ids,vals,context=None):
+        if context is None:
+            context = {}
         if (vals.has_key('project_id') and vals['project_id']) or (vals.has_key('name') and vals['name']):
             vals_line = {}
             hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
@@ -178,6 +182,8 @@ class project_project(osv.osv):
     _inherit = "project.project"
 
     def name_get(self, cr, user, ids, context=None):
+        if context is None:
+            context = {}
         result = []
         for project in self.browse(cr, user, ids, context):
             name = "[%s] %s" % (project.category_id and project.category_id.code or '?', project.name)
@@ -187,4 +193,3 @@ class project_project(osv.osv):
 project_project()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_timesheet/report/__init__.py b/addons/project_timesheet/report/__init__.py
index 232b71a8975..24e75e1cf35 100644
--- a/addons/project_timesheet/report/__init__.py
+++ b/addons/project_timesheet/report/__init__.py
@@ -20,4 +20,3 @@
 ##############################################################################
 import task_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 1e1a165b169..e98ced268cb 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -128,7 +128,6 @@ class report_timesheet_task_user(osv.osv):
 
       }
 
-
     def init(self, cr):
        cr.execute(""" create or replace view report_timesheet_task_user as (
         select
@@ -156,4 +155,3 @@ class report_timesheet_task_user(osv.osv):
 report_timesheet_task_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 5886d5351dd..5b9aa9d5a04 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -9,7 +9,6 @@
 
         <!-- Tasks by projects and users
 
-
         <record id="view_task_project_form" model="ir.ui.view">
             <field name="name">task.report.form</field>
             <field name="model">task.report</field>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index bdfb5663f66..10e35e0e04c 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="menu_purchase_deshboard"
-            name="Purchase"
-            parent="base.dashboard"/>
+            name="Dashboard"
+            icon="terp-graph"
+            parent="base.next_id_73" sequence="0"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Draft Purchases</field>
@@ -35,12 +35,13 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="220" name="%(purchase_draft)d" string="Draft Purchase Order"  width="510"/>
-                            <action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order in Waiting"  width="510"/>
+                            <action colspan="4" height="220" name="%(purchase.action_current_purchases)d" string="Current purchases"  width="510"/>
+                            <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(purchase.action_purchase_order_report_all)d" string="Total Qty and Amount by month"  />
-                            <action colspan="4" height="220" name="%(purchase.action_stock_move_report_po)d" string="Total Orders by User per month"  />
+                            <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
+                            <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
+                            <action colspan="4" height="220" name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"  />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f49b031bfd4..9f5827c5e68 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 77a97d4c98a..5ff4c01d9ff 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -851,3 +851,40 @@ msgstr ""
 msgid "Stock Moves"
 msgstr ""
 
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: purchase
+#: field:report.purchase.order.category,price_total:0
+#: field:report.purchase.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "In progress"
+msgstr ""
+
+
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 64abc11976b..59d48d13b43 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -141,7 +141,7 @@
             <field eval="&quot;&quot;&quot;condition_origin&quot;&quot;&quot;" name="name"/>
         </record>
 
-    	<record id="process_condition_conditioninvoicemanual" model="process.condition">
+        <record id="process_condition_conditioninvoicemanual" model="process.condition">
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="node_id" ref="process_node_invoicecontrol0"/>
             <field eval="&quot;&quot;&quot;object.invoice_method=='manual'&quot;&quot;&quot;" name="model_states"/>
@@ -152,20 +152,7 @@
             Process Transition
         -->
 
-    	<record id="res_roles_purchase0" model="res.roles">
-            <field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
-        </record>
-
-        <record id="purchase.trans_draft_confirmed" model="workflow.transition">
-            <field name="role_id" ref="res_roles_purchase0"/>
-        </record>
-
-        <record id="purchase.trans_router_invoice" model="workflow.transition">
-            <field name="role_id" ref="res_roles_purchase0"/>
-        </record>
-
         <record id="process_transition_productrecept0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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.&quot;&quot;&quot;" name="note"/>
@@ -174,7 +161,6 @@
         </record>
 
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -184,7 +170,6 @@
         </record>
 
         <record id="process_transition_confirmingpurchaseorder1" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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.&quot;&quot;&quot;" name="note"/>
@@ -193,7 +178,6 @@
         </record>
 
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approbation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The supplier approves the Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -202,7 +186,6 @@
         </record>
 
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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).&quot;&quot;&quot;" name="note"/>
@@ -212,7 +195,6 @@
         </record>
 
         <record id="process_transition_createpackinglist0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Pick list generated&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A pick list is generated to track the incoming products.&quot;&quot;&quot;" name="note"/>
@@ -221,7 +203,6 @@
         </record>
 
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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).&quot;&quot;&quot;" name="note"/>
@@ -230,7 +211,6 @@
         </record>
 
         <record id="process_transition_purchaseinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a purchase order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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.&quot;&quot;&quot;" name="note"/>
@@ -239,7 +219,6 @@
         </record>
 
         <record id="process_transition_packinginvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;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.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 139082d6d75..82e01735b00 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -20,18 +20,16 @@
 ##############################################################################
 
 from mx import DateTime
-from osv import fields
-from osv import osv
 import time
-import netsvc
-
-import ir
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
+from osv import osv, fields
+import netsvc
+import ir
 import pooler
 from tools import config
 from tools.translate import _
-
 import decimal_precision as dp
 from osv.orm import browse_record, browse_null
 
@@ -67,7 +65,7 @@ class purchase_order(osv.osv):
             res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
         return res
 
-    def _set_minimum_planned_date(self, cr, uid, ids, name, value, arg, context):
+    def _set_minimum_planned_date(self, cr, uid, ids, name, value, arg, context=None):
         if not value: return False
         if type(ids)!=type([]):
             ids=[ids]
@@ -79,7 +77,7 @@ class purchase_order(osv.osv):
                     (date_planned=%s or date_planned<%s)""", (value,po.id,po.minimum_planned_date,value))
         return True
 
-    def _minimum_planned_date(self, cr, uid, ids, field_name, arg, context):
+    def _minimum_planned_date(self, cr, uid, ids, field_name, arg, context=None):
         res={}
         purchase_obj=self.browse(cr, uid, ids, context=context)
         for purchase in purchase_obj:
@@ -132,7 +130,7 @@ class purchase_order(osv.osv):
                 res[r] = 100.0 * res[r][0] / res[r][1]
         return res
 
-    def _get_order(self, cr, uid, ids, context={}):
+    def _get_order(self, cr, uid, ids, context=None):
         result = {}
         for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, context=context):
             result[line.order_id.id] = True
@@ -148,16 +146,16 @@ class purchase_order(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Order Reference', size=64, required=True, select=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
-        'origin': fields.char('Source Document', size=64, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
+        'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"),
+        'origin': fields.char('Source Document', size=64,
             help="Reference of the document that generated this purchase order request."
         ),
         'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
         'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
-        'date_approve':fields.date('Date Approved', readonly=1),
+        'date_approve':fields.date('Date Approved', readonly=1, 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)]}),
+            states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
         'dest_address_id':fields.many2one('res.partner.address', 'Destination Address',
             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." \
@@ -170,11 +168,11 @@ class purchase_order(osv.osv):
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, help="An invoice generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
-        'shipped':fields.boolean('Received', readonly=True, select=True),
+        'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
         'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean'),
+        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
@@ -186,27 +184,27 @@ class purchase_order(osv.osv):
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums", help="The amount without tax"),
         'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums", help="The tax amount"),
         'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums",help="The total amount"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
     }
     _defaults = {
-        'date_order': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'draft',
+        'date_order': time.strftime('%Y-%m-%d'),
+        'state': 'draft',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
-        'shipped': lambda *a: 0,
-        'invoice_method': lambda *a: 'order',
-        'invoiced': lambda *a: 0,
+        '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),
@@ -629,6 +627,7 @@ class purchase_order_line(osv.osv):
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
     _description = 'Purchase Order Line'
+
     def copy_data(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
@@ -708,12 +707,14 @@ class purchase_order_line(osv.osv):
         if not uom:
             res['value']['price_unit'] = 0.0
         return res
+
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context)
         for (id,name) in self.name_get(cr, uid, ids):
             message = _('Purchase order line') + " '" + name + "' "+ _("is confirmed")
             self.log(cr, uid, id, message)
         return True
+
 purchase_order_line()
 
 class procurement_order(osv.osv):
@@ -796,7 +797,7 @@ class procurement_order(osv.osv):
             res[procurement.id] = purchase_id
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
         return res
+
 procurement_order()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4e5bdc8a4ab..79ef45424d2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,7 +5,7 @@
             groups="group_purchase_user" sequence="3"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
-        
+
         <!--supplier addresses action-->
         <record id="action_supplier_address_form" model="ir.actions.act_window">
             <field name="name">Addresses</field>
@@ -169,11 +169,12 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-accessories-archiver" name="sale_ok" string="Sales" domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Purchase order which are in draft state"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1" help="Approved purchase order"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -219,7 +220,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_draft': 1,'search_create_uid':uid}</field>
+            <field name="context">{'search_default_draft': 1,'search_default_create_uid':uid}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
@@ -231,7 +232,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1,'search_create_uid':uid}</field>
+            <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
@@ -302,14 +303,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                        <group>
+                		 <group>
                         <field name='order_id'/>
                         <field name="product_id"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                        <filter string="Order Reference" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter string="Product" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[('group_by' : 'order_id')]"/>
                         </group>
                </search>
             </field>
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
deleted file mode 100644
index d76ce1e3819..00000000000
--- a/addons/purchase/purchase_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-  <!-- 
-    <wizard id="purchase_order_merge"
-            model="purchase.order"
-            multi="True"
-            keyword="client_action_multi"
-            name="purchase.order.merge"
-            string="Merge purchases"/>
-             -->
-  </data>
-</openerp>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index d5688e5bd22..e85561f28b6 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -34,16 +34,14 @@ class purchase_report(osv.osv):
         'date': fields.date('Order Date', readonly=True),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'state': fields.selection([
-            ('draft','Quotation'),
-            ('waiting_date','Waiting Schedule'),
-            ('manual','Manual in progress'),
-            ('progress','In progress'),
-            ('shipping_except','Shipping Exception'),
-            ('invoice_except','Invoice Exception'),
-            ('done','Done'),
-            ('cancel','Cancel')
-        ], 'Order State', readonly=True),
+        'state': fields.selection([('draft', 'Request for Quotation'),
+                                    ('wait', 'Waiting'),
+                                     ('confirmed', 'Waiting Supplier Ack'),
+                                      ('approved', 'Approved'),
+                                      ('except_picking', 'Shipping Exception'),
+                                      ('except_invoice', 'Invoice Exception'),
+                                      ('done', 'Done'),
+                                      ('cancel', 'Cancelled')],'Order State', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 6b27a0ec6df..ccd0e477d1d 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -176,6 +176,99 @@
     </record>
     <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
 
+    <record model="ir.ui.view" id="view_purchase_by_supplier_graph">
+            <field name="name">purchase.by.supplier.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Purchase by supplier" type="bar">
+                    <field name="partner_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+	<record id="action_purchase_by_supplier" model="ir.actions.act_window">
+        <field name="name">Purchase by supplier</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('state','=','done'),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
+        <field name="view_id" ref="view_purchase_by_supplier_graph"/>
+    </record>
 
+    <record model="ir.ui.view" id="view_total_price_by_product_by_state_graph">
+            <field name="name">total.price.by.product.by.state.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Total price by product by state"  type="pie">
+                    <field name="product_id"/>
+                    <field name="state" group="True"/>
+                    <field name="price_total" operator="+"/>
+
+                </graph>
+            </field>
+        </record>
+	<record id="action_total_price_by_product_by_state" model="ir.actions.act_window">
+        <field name="name">Total price by product by state</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id','state']}</field>
+        <field name="view_id" ref="view_total_price_by_product_by_state_graph"/>
+    </record>
+
+    <record model="ir.ui.view" id="view_qty_per_product_graph">
+            <field name="name">qty.per.product.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Qty. per product" type="bar">
+                    <field name="product_id"/>
+                    <field name="quantity" operator="+"/>
+                </graph>
+            </field>
+        </record>
+	<record id="action_qty_per_product" model="ir.actions.act_window">
+        <field name="name">Qty. per product</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('state','=','done')]</field>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['product_id']}</field>
+        <field name="view_id" ref="view_qty_per_product_graph"/>
+    </record>
+
+   	   <record model="ir.ui.view" id="view_po_per_month_tree">
+            <field name="name">qty.per.product.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase order per month" >
+                    <field name="month"/>
+                    <field name="product_id" invisible="1"/>
+                    <field name="nbr" operator="+"/>
+                </tree>
+            </field>
+        </record>
+	<record id="action_po_per_month_tree" model="ir.actions.act_window">
+        <field name="name">Purchase order per month</field>
+        <field name="res_model">purchase.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('date','&gt;',time.strftime('%Y-01-01 00:00:00')),('date','&lt;',time.strftime('%Y-12-31 23:59:59')),('state','=','done')]</field>
+		<field name="context">{'group_by_no_leaf':1,'group_by':['month','product_id']}</field>
+		<field name="view_id" ref="view_po_per_month_tree"/>
+    </record>
+
+  <record id="action_current_purchases" model="ir.actions.act_window">
+        <field name="name">Current purchases</field>
+        <field name="res_model">purchase.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','in',('draft','confirmed'))]</field>
+        <field name="view_id" ref="purchase.purchase_order_tree"/>
+      </record>
     </data>
 </openerp>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index d1ccce7b15f..674b01f66e7 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -9,7 +9,6 @@
 "access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
 "access_account_tax_purchase_user","account.tax","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
 "access_report_purchase_order","purchase.report","model_purchase_report","purchase.group_purchase_manager",1,0,0,0
-"access_purchase_order_group","purchase.order.group","model_purchase_order_group","purchase.group_purchase_user",1,1,1,1
 "access_purchase_order_manager","purchase.order","model_purchase_order","purchase.group_purchase_manager",1,1,1,1
 "access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","purchase.group_purchase_manager",1,1,1,1
 "access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
@@ -20,6 +19,7 @@
 "access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
 "access_account_invoice_purchase","account_invoice purchase","account.model_account_invoice","group_purchase_user",1,1,1,1
 "access_account_invoice_line_purchase","account_invoice.line purchase","account.model_account_invoice_line","group_purchase_user",1,1,1,1
+"access_account_invoice_tax_purchase","account_invoice.tax purchase","account.model_account_invoice_tax","group_purchase_user",1,1,1,1
 "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
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 320b5d4609d..1848e9a7c61 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -11,14 +11,14 @@
 
 
     <record model="ir.rule" id="purchase_order_comp_rule">
-    	<field name="name">Purchase Order multi-company</field>
+        <field name="name">Purchase Order multi-company</field>
         <field name="model_id" ref="model_purchase_order"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="purchase_order_line_comp_rule">
-    	<field name="name">Purchase Order Line multi-company</field>
+        <field name="name">Purchase Order Line multi-company</field>
         <field name="model_id" ref="model_purchase_order_line"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 087c9d6ddc8..245da72cad8 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/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/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ class stock_move(osv.osv):
             readonly=True),
     }
     _defaults = {
-        'purchase_line_id': lambda *a:False
+        'purchase_line_id': False
     }
 stock_move()
 
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 8c4e0784a7b..d9778dceb47 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,46 +15,39 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
 
 from osv import fields, osv
-from service import web_services
 import netsvc
 import pooler
-import time
-import wizard
 from osv.orm import browse_record, browse_null
 
 class purchase_order_group(osv.osv_memory):
     _name = "purchase.order.group"
-    _description = "Purchase Wizard"
-    _columns = {
-          
-        } 
+    _description = "Purchase Order Merge"
 
     def merge_orders(self, cr, uid, ids, context):
-        """ 
+        """
              To merge similar type of purchase orders.
-            
+
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs 
-             @param context: A standard dictionary 
-             
+             @param ids: the ID or list of IDs
+             @param context: A standard dictionary
+
              @return: purchase order view
-            
-        """              
+
+        """
         order_obj = self.pool.get('purchase.order')
         mod_obj =self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-      
 
         allorders = order_obj.do_merge(cr, uid, context.get('active_ids',[]), context)
-        
 
         return {
         'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
@@ -66,5 +59,7 @@ class purchase_order_group(osv.osv_memory):
         'type': 'ir.actions.act_window',
         'search_view_id': id['res_id']
         }
+
 purchase_order_group()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index aa835b36f0b..cec987bc5ea 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -13,10 +13,10 @@
 Please note that: &#13; &#13;  
 Orders will only be merged if: &#13;  
 * Purchase Orders are in draft &#13;  
-* Purchase Orders belong to the same partner &#13;  
+* Purchase Orders belong to the same supplier &#13;  
 * Purchase Orders are have same stock location, same pricelist &#13; &#13;   
 Lines will only be merged if: &#13;  
-* Order lines are exactly the same except for the quantity and unit &#13;
+* Order lines are exactly the same except for the product,quantity and unit &#13;
 " colspan="4"/>				
 				    <newline/>    				
         			<separator string="" colspan="4" />
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 757868f13ed..0af2f90ba47 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,17 +15,15 @@
 #    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/>.
 #
 ##############################################################################
-
-from osv import fields
-from osv import osv
 import time
-import netsvc
-
-import ir
 from mx import DateTime
+
+from osv import fields, osv
+import netsvc
+import ir
 import pooler
 from tools import config
 
@@ -34,7 +32,7 @@ class purchase_order_line(osv.osv):
     _inherit='purchase.order.line'
     _columns = {
         'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
-    }
+                }
 
 purchase_order_line()
 
@@ -48,5 +46,5 @@ class purchase_order(osv.osv):
         return res
 
 purchase_order()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 4a85390e6a8..3bdc461917b 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -20,10 +20,11 @@
 #
 ##############################################################################
 
+import time
+
 from osv import fields,osv
 from osv import orm
 import netsvc
-import time
 from tools.translate import _
 
 class purchase_requisition(osv.osv):
@@ -35,24 +36,23 @@ class purchase_requisition(osv.osv):
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', help="If the requisition is exclusive, it will cancel all purchase orders when you confirm one of them", required=True),
+        'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Tender (exclusive):On the confirmation of a purchase order, it cancels the remaining purchase order.Multiple Requisitions:It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
-        'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'),
+        'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
     }
     _defaults = {
-        'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'state': lambda *args: 'draft',
-        'exclusive': lambda *args: 'multiple',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
+        'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'state': 'draft',
+        'exclusive': 'multiple',
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition', context=c),
+        'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
     }
 
-
-    def tender_cancel(self, cr, uid, ids, context={}):
+    def tender_cancel(self, cr, uid, ids, context=None):
         purchase_order_obj = self.pool.get('purchase.order')
         for purchase in self.browse(cr, uid, ids):
             for purchase_id in purchase.purchase_ids:
@@ -61,35 +61,41 @@ class purchase_requisition(osv.osv):
         self.write(cr, uid, ids, {'state': 'cancel'})
         for (id,name) in self.name_get(cr, uid, ids):
                     message = _('Tender') + " '" + name + "' "+ _("is cancelled")
-                    self.log(cr, uid, id, message) 
+                    self.log(cr, uid, id, message)
         return True
-    def tender_in_progress(self, cr, uid, ids, context={}):
+
+    def tender_in_progress(self, cr, uid, ids, context=None):
+        for quotations in self.browse(cr, uid, ids):
+            if not quotations.purchase_ids:
+                raise osv.except_osv(_('Purchase order required'),('You should have atleast one purchase order line defined for this tender'))
         self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
         for (id,name) in self.name_get(cr, uid, ids):
                     message = _('Tender') + " '" + name + "' "+ _(" is In Progress")
-                    self.log(cr, uid, id, message) 
+                    self.log(cr, uid, id, message)
         return True
-    def tender_reset(self, cr, uid, ids, context={}):
+
+    def tender_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'draft'})
         for (id,name) in self.name_get(cr, uid, ids):
                     message = _('Tender') + " '" + name + "' "+ _("is in draft state")
-                    self.log(cr, uid, id, message) 
+                    self.log(cr, uid, id, message)
         return True
-    def tender_done(self, cr, uid, ids, context={}):
+
+    def tender_done(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         for (id,name) in self.name_get(cr, uid, ids):
                     message = _('Tender') + " '" + name + "' "+ _("is done")
-                    self.log(cr, uid, id, message) 
+                    self.log(cr, uid, id, message)
         return True
 
-
-
 purchase_requisition()
 
 class purchase_requisition_line(osv.osv):
+
     _name = "purchase.requisition.line"
     _description="Purchase Requisition Line"
     _rec_name = 'product_id'
+
     _columns = {
         'product_id': fields.many2one('product.product', 'Product' ),
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
@@ -99,8 +105,7 @@ class purchase_requisition_line(osv.osv):
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade')
     }
 
-    def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context={}):
-
+    def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
         @param product_id: Changed product_id
@@ -109,12 +114,12 @@ class purchase_requisition_line(osv.osv):
         value = {'product_uom_id': ''}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
-            value = {'product_uom_id': prod.uom_id.id}
+            value = {'product_uom_id': prod.uom_id.id,'product_qty':1.0}
         return {'value': value}
 
     _defaults = {
-                 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
-                 }
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition.line', context=c),
+                }
 purchase_requisition_line()
 
 class purchase_order(osv.osv):
@@ -131,30 +136,30 @@ class purchase_order(osv.osv):
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
                     self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
-
         return res
 
-
 purchase_order()
 
-
 class product_product(osv.osv):
     _inherit = 'product.product'
+
     _columns = {
         'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
     }
     _defaults = {
-        'purchase_requisition': lambda *args: False
+        'purchase_requisition': False
     }
+
 product_product()
 
-
 class procurement_order(osv.osv):
+
     _inherit = 'procurement.order'
-    def make_po(self, cr, uid, ids, context={}):
-        sequence_obj=self.pool.get('ir.sequence')
-        res = super(procurement_order, self).make_po(cr, uid, ids, context)
-        for proc_id,po_id in res.items():
+
+    def make_po(self, cr, uid, ids, context=None):
+        sequence_obj = self.pool.get('ir.sequence')
+        res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
+        for proc_id, po_id in res.items():
             procurement = self.browse(cr, uid, proc_id)
             if procurement.product_id.purchase_requisition:
                 self.pool.get('purchase.requisition').create(cr, uid, {
@@ -170,4 +175,7 @@ class procurement_order(osv.osv):
                     'purchase_ids': [(6,0,[po_id])]
                 })
         return res
+
 procurement_order()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 172be8c06e8..93f4f111da0 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -78,7 +78,7 @@
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
-                                </tree>
+                            </tree>
                          </field>
                         <separator colspan="4" string=""/>
                          <group col="8" colspan="4">
@@ -117,14 +117,12 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
+                    <filter icon="terp-camera_test" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+                    <filter icon="terp-check" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Requisition Reference"/>
-                    <field name="purchase_ids" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="exclusive" select="1" />
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    <field name="name" string="Requisition Reference"/>
+                    <field name="user_id" />
+                    <field name="exclusive" />
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 3f74e857035..c82dfdb3bd2 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +15,17 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+import time
+from mx import DateTime
+
 from osv import fields, osv
 from service import web_services
 import netsvc
 import pooler
-import time
-from mx import DateTime
 from osv.orm import browse_record, browse_null
 
 class purchase_requisition_partner(osv.osv_memory):
@@ -33,38 +34,39 @@ class purchase_requisition_partner(osv.osv_memory):
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
-    }
+                }
 
-        
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(purchase_requisition_partner, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False        
+        record_id = context and context.get('active_id', False) or False
         tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id)
         if not tender.line_ids:
-                raise osv.except_osv('Error!','No Product in Tender')
+            raise osv.except_osv('Error!','No Product in Tender')
         True
 
     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):
-        """ 
+        """
              To Create a purchase orders .
-            
+
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs 
-             @param context: A standard dictionary 
+             @param ids: the ID or list of IDs
+             @param context: A standard dictionary
              @return: {}
-            
-        """      
+
+        """
         record_ids = context and context.get('active_ids', False)
         if record_ids:
             data =  self.read(cr, uid, ids)
-            company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id        
+            company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
             order_obj = self.pool.get('purchase.order')
             order_line_obj = self.pool.get('purchase.order.line')
             partner_obj = self.pool.get('res.partner')
@@ -72,29 +74,29 @@ class purchase_requisition_partner(osv.osv_memory):
             pricelist_obj = self.pool.get('product.pricelist')
             prod_obj = self.pool.get('product.product')
             tender_obj = self.pool.get('purchase.requisition')
-            acc_pos_obj = self.pool.get('account.fiscal.position')            
+            acc_pos_obj = self.pool.get('account.fiscal.position')
             partner_id = data[0]['partner_id']
-            
+
             supplier_data = partner_obj.browse(cr, uid,[ partner_id])[0]
 
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
             purchase_order_line={}
             for tender in tender_obj.browse(cr, uid, record_ids):
-                for line in tender.line_ids:                
+                for line in tender.line_ids:
                     partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
                     partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
-                    uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False            
+                    uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
                     newdate = DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
                     delay = partner_rec and partner_rec.delay or False
                     newdate = newdate -(delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
                     partner = partner_rec and partner_rec.name or supplier_data
-                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False 
+                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
-        
-                    
+
+
                     purchase_order_line= {
                             'name': product.partner_ref,
                             'product_qty': line.product_qty,
@@ -108,14 +110,14 @@ class purchase_requisition_partner(osv.osv_memory):
                     taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
                     purchase_order_line.update({
                             'taxes_id': [(6,0,taxes)]
-                        })   
+                        })
                     list_line.append(purchase_order_line)
                 purchase_id = order_obj.create(cr, uid, {
                             'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
                             'partner_id': partner_id,
                             'partner_address_id': address_id,
                             'pricelist_id': pricelist_id,
-                            'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,                        
+                            'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,
                             'company_id': tender.company_id.id,
                             'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
                             'requisition_id':tender.id,
@@ -124,9 +126,11 @@ class purchase_requisition_partner(osv.osv_memory):
                 for order_line in list_line:
                     order_line.update({
                             'order_id': purchase_id
-                        })   
+                        })
                     order_line_obj.create(cr,uid,order_line)
-        return {}        
+        return {}
 
 purchase_requisition_partner()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/security/ir.model.access.csv b/addons/report_designer/security/ir.model.access.csv
index e6500199afe..0343f29f43a 100644
--- a/addons/report_designer/security/ir.model.access.csv
+++ b/addons/report_designer/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_designer_installer","report_designer.installer","model_report_designer_installer",base.group_system,1,1,1,1
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index d00074cf54e..49e04abbe53 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -38,6 +38,10 @@
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager'}"/>
+                    </group>                   
                </search>
             </field>
         </record>
@@ -58,6 +62,8 @@
                    <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_from'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 2f290ce5dd8..0e25af519b4 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -50,9 +50,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
-
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem id="next_id_88" name="Sales" parent="base.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
+		<menuitem icon="terp-graph" 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"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 6bd641d94f3..35e16f6c59a 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "خطوات لتقديم طلب للبيع"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "الكمية"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "اعلان تلقائى"
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "ملاحظات"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr "الفاتورة بعد التسليم"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "الضرائب"
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -866,8 +851,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,8 +1077,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 0ef4e79e5b5..0b1392be5bd 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Стъпки за доставка на поръчка за продажба"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Количество"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Фактурата Ви бе създадена успешно !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Автоматична декларация"
 
@@ -160,9 +158,7 @@ msgid "Manual Designation"
 msgstr "Ръчно обозначаване"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Бележки"
@@ -173,8 +169,7 @@ msgid "Invoice after delivery"
 msgstr "Фактура след доставка"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Данъци"
 
@@ -234,8 +229,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Създава се снабдяване след потвърждение на поръчка за продажба"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Аналитична сметка"
 
@@ -325,8 +319,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Фактури върху поръчки за продажба"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Магазин за продажба"
 
@@ -341,8 +334,7 @@ msgid "Order N°"
 msgstr "Поръчка N°"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Редове от поръчка"
 
@@ -352,8 +344,7 @@ msgid "Disc.(%)"
 msgstr "Отстъпка (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Редове на фактура"
@@ -451,15 +442,13 @@ msgid "Order Reference"
 msgstr "Отпратка към поръчка"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Готов"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Ценова листа"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Данъци :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Фактуриран"
 
@@ -787,8 +775,7 @@ msgid "Direct Delivery"
 msgstr "Директна доставка"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Свойства"
@@ -820,8 +807,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Магазин"
 
@@ -884,8 +870,7 @@ msgid "Delivery Order Only"
 msgstr "Поръчка само за доставка"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Редове от поръчки за продажба"
 
@@ -900,8 +885,7 @@ msgid "Sales"
 msgstr "Продажби"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "К-во"
 
@@ -916,8 +900,7 @@ msgid "Other data"
 msgstr "Други данни"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Единична цена"
@@ -943,8 +926,7 @@ msgstr "Фактура"
 #: 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
+#: 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"
@@ -967,8 +949,7 @@ msgstr ""
 "стартира на датата 'Дата на поръчката'"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Мер. единици"
 
@@ -1083,8 +1064,7 @@ msgid "Ordering Contact"
 msgstr "Контакт за поръчка"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Описание"
 
@@ -1141,8 +1121,7 @@ msgid ""
 msgstr "Името и адреса на контакта който е поискал запитване или поръчка"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Клиент"
 
@@ -1154,8 +1133,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Поръчка за продажба"
@@ -1182,8 +1160,7 @@ msgid "Total amount"
 msgstr "Обща сума"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Дата на поръчка"
 
@@ -1272,8 +1249,7 @@ msgstr ""
 "редове)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Състояния"
 
@@ -1293,8 +1269,7 @@ msgid "Error: Invalid ean code"
 msgstr "Грешка: Невалиден бар код"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Натоварен"
 
@@ -1323,3 +1298,243 @@ msgstr "Моите поръчки за продажба"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Ред от поръчка за продажба"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Средна цена"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Доклад за изготвена поръчка за продажба"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr "Натрупан годишен оборот от продажби по месеци"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Поръчки за продажба по продукт"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr "Оборот по продукт"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Всички месеци"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Крайна цена"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr "Годишен оборот от продажби по месеци"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr "Продажби по категория от продукти"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Натрупан годишен оборот от продажби по месеци"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr "Продажби по продукт"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Този месец"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Категории"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Създадени поръчки за продажба"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr "Оборот за месец"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Годишен оборот от продажби по дни"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Диаграми"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Ръчно в изпълнение"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Общо оборот"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr "Месец"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# от редове"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Дата на създаване"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Изготвени поръчки за продажба"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Продажби по област"
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index b78e770130d..25a8012fed1 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Koraci da bi se otpremila roba iz prodajnog naloga"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Uspješno ste kreirali Fakturu!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automatska deklaracija"
 
@@ -158,9 +156,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Bilješke"
@@ -171,8 +167,7 @@ msgid "Invoice after delivery"
 msgstr "Račun po isporuci"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Porezi"
 
@@ -232,8 +227,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Nabavka je nastala nakon potvrde naloga za prodaju."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analitičko konto"
 
@@ -324,8 +318,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Faktura kreirana na osnovu Prodajnog naloga"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Prodavnica"
 
@@ -340,8 +333,7 @@ msgid "Order N°"
 msgstr "Nalog N°"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Stavke naloga"
 
@@ -351,8 +343,7 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Stavka Fakture"
@@ -447,15 +438,13 @@ msgid "Order Reference"
 msgstr "Referenca naloga"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Urađeno"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cjenovnik"
 
@@ -626,8 +615,7 @@ msgid "Taxes :"
 msgstr "Porezi"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Fakturisano"
 
@@ -673,8 +661,7 @@ msgstr "Kreiraj Fakturu"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Greška: Standardna JM i nabavna JM moraju pripadati istoj kategoriji."
+msgstr "Greška: Standardna JM i nabavna JM moraju pripadati istoj kategoriji."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
@@ -781,8 +768,7 @@ msgid "Direct Delivery"
 msgstr "Direktna isporuka"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Postavke"
@@ -814,8 +800,7 @@ msgstr "Izračunaj"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Prodavnica"
 
@@ -866,8 +851,7 @@ msgid "Delivery Order Only"
 msgstr "Samo isporuka"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Stavke Prodajnog naloga"
 
@@ -882,8 +866,7 @@ msgid "Sales"
 msgstr "Prodaja"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Količina"
 
@@ -898,8 +881,7 @@ msgid "Other data"
 msgstr "Ostali podaci"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Jedinična cijena"
@@ -925,8 +907,7 @@ msgstr "Faktura"
 #: 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
+#: 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"
@@ -948,8 +929,7 @@ msgstr ""
 "se prikazao 'Datum naloga'."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "JM"
 
@@ -1063,8 +1043,7 @@ msgid "Ordering Contact"
 msgstr "Kontakt pri naručivanju"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -1123,8 +1102,7 @@ msgstr ""
 "Prodajnim nalogom."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kupac"
 
@@ -1136,8 +1114,7 @@ msgstr "Nabavni cjenovnik"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Prodajni nalog"
@@ -1164,8 +1141,7 @@ msgid "Total amount"
 msgstr "Ukupni iznos"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Datum naruđbe"
 
@@ -1252,8 +1228,7 @@ msgstr ""
 "primjer)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Status"
 
@@ -1273,8 +1248,7 @@ msgid "Error: Invalid ean code"
 msgstr "Greška: nevažeći EAN kod"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Izuzeto"
 
@@ -1303,3 +1277,243 @@ msgstr "Moj Prodajni nalog"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Stavka prodajnog naloga"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Informacije o prodaji"
+
+#. 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"
+msgstr "Informacije o prodaji"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Prodaja mjeseca"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Prodaja - tabla upravljanja"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Slućaji u mjesecu"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Moji otvoreni upiti"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Statistika slućajeva"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Top 10 prodaja u mjesecu"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index ed5e96281f6..49590f4cc1d 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-04 09:30+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Passos per enviar una comanda de venda"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Quantitat"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "La vostra factura s'ha creat correctament!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Declaració automàtica"
 
@@ -108,8 +106,7 @@ msgstr "Excepció de factura"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
-"Aquesta és la llista d'albarans que s'han generat per aquesta factura"
+msgstr "Aquesta és la llista d'albarans que s'han generat per aquesta factura"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
@@ -162,9 +159,7 @@ msgid "Manual Designation"
 msgstr "Designació manual"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notes"
@@ -175,8 +170,7 @@ msgid "Invoice after delivery"
 msgstr "Factura després de l'enviament"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impostos"
 
@@ -236,8 +230,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "El proveïment es creat després de confirmar una comanda de venda."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Compte analític"
 
@@ -328,8 +321,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Factura basada en comandes de venda"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Tenda de vendes"
 
@@ -344,8 +336,7 @@ msgid "Order N°"
 msgstr "Comanda Nº"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Línies de la comanda"
 
@@ -355,8 +346,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Línies de factura"
@@ -453,15 +443,13 @@ msgid "Order Reference"
 msgstr "Referència comanda"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Realitzada"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarifa"
 
@@ -632,8 +620,7 @@ msgid "Taxes :"
 msgstr "Impostos :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturat"
 
@@ -788,8 +775,7 @@ msgid "Direct Delivery"
 msgstr "Enviament directe"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Propietats"
@@ -822,8 +808,7 @@ msgstr "Calcula"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Tenda"
 
@@ -874,8 +859,7 @@ msgid "Delivery Order Only"
 msgstr "Només ordre d'enviament"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Línies de la comanda de venda"
 
@@ -890,8 +874,7 @@ msgid "Sales"
 msgstr "Vendes"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Qtat"
 
@@ -906,8 +889,7 @@ msgid "Other data"
 msgstr "Altres dades"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preu un."
@@ -933,8 +915,7 @@ msgstr "Factura"
 #: 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
+#: 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"
@@ -957,8 +938,7 @@ msgstr ""
 "la data 'Data de la comanda'."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UdM"
 
@@ -1073,8 +1053,7 @@ msgid "Ordering Contact"
 msgstr "Contacte que fa la comanda"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Descripció"
 
@@ -1131,8 +1110,7 @@ msgid ""
 msgstr "El nom i adreça del contacte que demana la comanda o pressupost."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Client"
 
@@ -1144,8 +1122,7 @@ msgstr "Tarifes de compra"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Comanda de venda"
@@ -1172,8 +1149,7 @@ msgid "Total amount"
 msgstr "Import total"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data ordenada"
 
@@ -1262,8 +1238,7 @@ msgstr ""
 "(línia per línia per exemple)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Estats"
 
@@ -1283,8 +1258,7 @@ msgid "Error: Invalid ean code"
 msgstr "Error: Codi EAN erroni"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Enviada"
 
@@ -1313,3 +1287,243 @@ msgstr "Les meves comandes de venda"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Línia de la comanda de venda"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Taulell per a vendes"
+
+#. 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"
+msgstr "Taulell de vendes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Vendes del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Taulell de vendes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Casos del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Els meus pressuposts oberts"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estadística de casos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Primeres deu vendes del mes"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Preu mig"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Informe de comanda de venda creats"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Comandes de vendes per categoria"
+
+#. 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"
+msgstr "Moviment mensual de vendes acumulades sobre un any"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Comandes de vendes per productes"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Moviment mensual de vendes sobre un any"
+
+#. 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"
+msgstr "Volum per producte"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Tots els mesos"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Preu total"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Comandes de vendes per categories"
+
+#. 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"
+msgstr "Vendes del mes"
+
+#. 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)"
+msgstr "Vendes per producte (aquest mes)"
+
+#. 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"
+msgstr "Moviment mensual de vendes sobre un any"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Informes - Gestió de vendes"
+
+#. 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"
+msgstr "Vendes per categoria de productes"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Moviment mensual de vendes acumulades sobre un any"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# de productes"
+
+#. 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"
+msgstr "Vendes per producte"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Aquest mes"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categories"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Comandes de venda creades"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Informe"
+
+#. 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"
+msgstr "Volum per mesos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Moviment diari de vendes sobre un any"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Resums"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manual en procés"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Volum total"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "En procés"
+
+#. 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)"
+msgstr "Vendes per categoria de producte (aquest mes)"
+
+#. 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"
+msgstr "Moviment diari de vendes sobre un any"
+
+#. 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"
+msgstr "Mes"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# de línies"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Data creació"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Comandes de venda creades"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Vendes per estat"
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 70e27e84097..038d4b9ef74 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Počet"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Poznámky"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Daně"
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analytický účet"
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -463,7 +452,7 @@ msgstr ""
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Invalidní XML pro zobrazení architektury!"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -866,8 +851,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1040,8 +1021,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1098,8 +1078,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1111,8 +1090,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1139,8 +1117,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1222,8 +1199,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1243,8 +1219,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1273,3 +1248,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 7a86fca5bf2..705d4fccc0c 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Schritte für die Auslieferung eines Verkaufsauftrags"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Menge"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Ihre Rechnung wurde erfolgreich generiert!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automatischer Liefernachweis"
 
@@ -159,9 +157,7 @@ msgid "Manual Designation"
 msgstr "Manuelle Rechnungshinweise"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Bemerkungen"
@@ -172,8 +168,7 @@ msgid "Invoice after delivery"
 msgstr "Rechnung nach Auslieferung"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Umsatzsteuer"
 
@@ -234,8 +229,7 @@ msgstr ""
 "Beschaffungsauftrag wird erzeugt nach Bestätigung des Verkaufsauftrags."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analytisches Konto"
 
@@ -327,8 +321,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Rechnung basierend auf Verkaufsauftrag"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Verkaufsshop"
 
@@ -343,8 +336,7 @@ msgid "Order N°"
 msgstr "Bestellnummer"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Auftragszeilen"
 
@@ -354,8 +346,7 @@ msgid "Disc.(%)"
 msgstr "Rabatt (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Rechnungszeilen"
@@ -453,15 +444,13 @@ msgid "Order Reference"
 msgstr "Referenz Bestellung"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Erledigt"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Preisliste"
 
@@ -632,8 +621,7 @@ msgid "Taxes :"
 msgstr "Steuern:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Abgerechnet"
 
@@ -788,8 +776,7 @@ msgid "Direct Delivery"
 msgstr "Direktbelieferung"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Eigenschaften"
@@ -822,8 +809,7 @@ msgstr "Berechne"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Shop"
 
@@ -883,8 +869,7 @@ msgid "Delivery Order Only"
 msgstr "Auslieferung"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Auftragspositionen"
 
@@ -899,8 +884,7 @@ msgid "Sales"
 msgstr "Verkaufsaufträge"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Anz."
 
@@ -915,8 +899,7 @@ msgid "Other data"
 msgstr "Andere Daten"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preis/UoM"
@@ -942,8 +925,7 @@ msgstr "Rechnung"
 #: 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
+#: 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"
@@ -964,8 +946,7 @@ msgstr ""
 "Erstellung am \"Auftragsdatum\" wartet."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UoM"
 
@@ -981,8 +962,8 @@ msgid ""
 "by clicking on 'Validate' button."
 msgstr ""
 "Bestätigung des Packauftrags verschiebt diesen zu den "
-"Auslieferungsaufträgen. Dieses kann durch Klick auf  \"Bestätigen\" "
-"(Validate) vorgenommen werden."
+"Auslieferungsaufträgen. Dieses kann durch Klick auf  \"Bestätigen"
+"\" (Validate) vorgenommen werden."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1081,8 +1062,7 @@ msgid "Ordering Contact"
 msgstr "Ansprechpartner Auftrag"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1139,8 +1119,7 @@ msgid ""
 msgstr "Name und Adresse des Kontaktes der das Angebot angefragt hat."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kunde"
 
@@ -1152,8 +1131,7 @@ msgstr "Preisliste Einkauf"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Verkaufsauftrag"
@@ -1180,8 +1158,7 @@ msgid "Total amount"
 msgstr "Gesamtwert"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Auftragsdatum"
 
@@ -1270,8 +1247,7 @@ msgstr ""
 "Position)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Bundesland"
 
@@ -1291,8 +1267,7 @@ msgid "Error: Invalid ean code"
 msgstr "Fehler: Falscher EAN code"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Gepackt"
 
@@ -1321,3 +1296,243 @@ msgstr "Meine Aufträge (Verkauf)"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Verkaufsposition"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Verkäufe Anzeigetafel"
+
+#. 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"
+msgstr "Verkauf Dashboard"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Verkäufe des Monats"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Verkaufsmanager Dashboard"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Fälle des Monats"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Meine offenen Angebote"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Fallstatistik"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Top Ten Verkäufe des Monats"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Durch. Preis"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Bericht neue Verkaufsaufträge"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Verkäufe nach Kategorien"
+
+#. 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"
+msgstr "Jahresumsatz nach Monaten kumm."
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Verkäufe nach Produkten"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Jahresumsatz nach Monaten"
+
+#. 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"
+msgstr "Umsatz je Produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Alle Monate"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Gesamtpreis"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Verkäufe nach Kategorien"
+
+#. 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"
+msgstr "Verkäufe des Monats"
+
+#. 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)"
+msgstr "Verkäufe nach Produkten (dieser Monat)"
+
+#. 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"
+msgstr "Jahresumsatz nach Monaten"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Verkaufsverwaltung - Berichte"
+
+#. 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"
+msgstr "Verkäufe nach Produktkategorien"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Jahresumsatz nach Monaten kumm."
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# Produkte"
+
+#. 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"
+msgstr "Verkauf nach Produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Dieser Monat"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategorien"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Erstellte Verkaufsaufträge"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Berichtswesen"
+
+#. 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"
+msgstr "Umsatz je Monat"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Jahresumsatz nach Tagen"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Graphiken"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manuelle Bearbeitung"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Gesamtumsatz"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "Im Fortschritt"
+
+#. 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)"
+msgstr "Verkäufe nach Produktkategorien (dieser Monat)"
+
+#. 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"
+msgstr "Jahresumsatz nach Tagen"
+
+#. 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"
+msgstr "Monat"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# Positionen"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Neue Verkaufsaufträge"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Verkäufe je Staat"
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index a1a6a9c09bf..983de6021e7 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Βήματα για την παράδοση μιάς εντολής πώλησης"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Ποσότητα"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Το τιμολόγιο σας έχει δημιουργηθεί με επιτυχία!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Αυτόματη Δήλωση"
 
@@ -163,9 +161,7 @@ msgid "Manual Designation"
 msgstr "Χειροκίνητος Προσδιορισμός"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Σημειώσεις"
@@ -176,8 +172,7 @@ msgid "Invoice after delivery"
 msgstr "Τιμολόγιο κατόπιν παράδοσης"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Φόροι"
 
@@ -234,12 +229,10 @@ msgstr "Όλα Αμέσως"
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
-"Οι προμήθειες δημιουργούνται κατόπιν επιβεβαίωσης της εντολής πώλησης."
+msgstr "Οι προμήθειες δημιουργούνται κατόπιν επιβεβαίωσης της εντολής πώλησης."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Αναλυτικός Λογαριασμός"
 
@@ -330,8 +323,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Τιμολόγια βάσει εντολών πώλησης"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Κατάστημα Πώλησης"
 
@@ -346,8 +338,7 @@ msgid "Order N°"
 msgstr "Αρ. Εντολής"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Γραμμές Εντολής"
 
@@ -357,8 +348,7 @@ msgid "Disc.(%)"
 msgstr "Εκπτ.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Γραμμές Τιμολογίου"
@@ -456,15 +446,13 @@ msgid "Order Reference"
 msgstr "Παραπομπή Εντολής"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Εκπληρωμένο"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Τιμοκατάλογος"
 
@@ -637,8 +625,7 @@ msgid "Taxes :"
 msgstr "Φόροι:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Τιμολογημένα"
 
@@ -793,8 +780,7 @@ msgid "Direct Delivery"
 msgstr "Απευθείας Παράδοση"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Ιδιότητες"
@@ -827,8 +813,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Κατάστημα"
 
@@ -891,8 +876,7 @@ msgid "Delivery Order Only"
 msgstr "Μόνον Εντολή Παράδοσης"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Γραμμές εντολών πώλησης"
 
@@ -907,8 +891,7 @@ msgid "Sales"
 msgstr "Πωλήσεις"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Ποσότητα"
 
@@ -923,8 +906,7 @@ msgid "Other data"
 msgstr "Άλλες πληροφορίες"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Τιμή Μονάδας"
@@ -950,8 +932,7 @@ msgstr "Τιμολόγιο"
 #: 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
+#: 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"
@@ -974,8 +955,7 @@ msgstr ""
 "'Ημερομηνία Παραγγελίας'."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "1η ΜΜ"
 
@@ -1090,8 +1070,7 @@ msgid "Ordering Contact"
 msgstr "Επαφή Τιμολογίου"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -1150,8 +1129,7 @@ msgstr ""
 "προσφορά."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Πελάτης"
 
@@ -1163,8 +1141,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Εντολή Πώλησης"
@@ -1191,8 +1168,7 @@ msgid "Total amount"
 msgstr "Συνολικό ποσό"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Ημερομηνία Εντολής"
 
@@ -1281,8 +1257,7 @@ msgstr ""
 "παράδειγμα σε γραμμή)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Καταστάσεις"
 
@@ -1302,8 +1277,7 @@ msgid "Error: Invalid ean code"
 msgstr "Σφάλμα: Άκυρος κώδικας ΕΑΝ"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Picked"
 
@@ -1333,6 +1307,234 @@ msgstr "Οι εντολές πωλήσεων μου"
 msgid "Sale Order line"
 msgstr "Γραμμή Εντολών Πώλησης"
 
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "Πίνακας Αναφορών Πωλήσεων"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Πωλήσεις του μήνα"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Πίνακας διευθυντή πωλήσεων"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Θέματα του μήνα"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Οι ανοικτές προσφορές μου"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Στατιστικά θεμάτων"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Top ten πωλήσεις του μήνα"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Μέση Τιμή"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Αναφορά των Δημιουργημένων Εντολών Πώλησης"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr "Μηνιαίος συσσωρευμένος τζίρος ως προς το έτος"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Εντολές Πώλησεις κατα Προϊόν"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr "Τζίρος ανά προϊόν"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Όλοι οι Μήνες"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Συνολική Τιμή"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr "Μηνιαίος τζίρος ως προς το έτος"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr "Πωλήσεις κατα Κατηγορία Προϊόντων"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Μηνιαίος συσσωρευμένος τζίρος ως προς το έτος"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr "Πωλήσεις κατα Προϊόν"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Τρέχων Μήνας"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Κατηγορίες"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Εντολή Πώλησης Δημιουργήθηκε"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr "Τζίρος ανά μήνα"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Ημερήσιος τζίρος ως προς το έτος"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Γραφήματα"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+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)"
+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"
+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"
+msgstr "Μήνας"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# Γραμμών"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Εντολές Πώλησης Δημιουργήθηκαν"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Πωλήσεις κατα Κατάσταση"
+
 #~ msgid "Customer Ref."
 #~ msgstr "Σχετ. Πελάτη"
 
@@ -1342,17 +1544,14 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ msgid "Shop name"
 #~ msgstr "Όνομα Καταστήματος"
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Σφάλμα!"
 
-#, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
-#~ "Θα πρέπει πρώτα να ακυρώσετε τα επισυναπτόμενα τιμολόγια αυτής της εντολής "
-#~ "πώλησης."
+#~ "Θα πρέπει πρώτα να ακυρώσετε τα επισυναπτόμενα τιμολόγια αυτής της "
+#~ "εντολής πώλησης."
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Άκυρη ενέργεια!"
 
@@ -1362,7 +1561,6 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ msgid "Number packages"
 #~ msgstr "Αριθμοδότηση συσκευασιών"
 
-#, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Αδύνατη η ακύρωση της εντολής πώλησης!"
 
@@ -1375,7 +1573,6 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ msgid "Quantity (UOS)"
 #~ msgstr "Ποσότητα (2η ΜΜ)"
 
-#, python-format
 #~ msgid "invalid mode for test_state"
 #~ msgstr "άκυρη κατάσταση για test_state"
 
@@ -1389,11 +1586,9 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ "Εάν δεν έχετε αρκετό διαθέσιμο απόθεμα για ολοκληρωμένη παράδοση, "
 #~ "συμφωνείται για μερική παράδοση ή όχι."
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Σφάλμα"
 
-#, python-format
 #~ msgid "You must first cancel all packings attached to this sale order."
 #~ msgstr ""
 #~ "Θα πρέπει πρώτα να ακυρώσετε τις επισυναπτόμενες φορτώσεις για την εντολή "
@@ -1402,33 +1597,30 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ msgid "Product UOS"
 #~ msgstr "2η ΜΜ Προϊόντος"
 
-#, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Αδύνατη η ακύρωση αυτής της εντολής πώλησης!"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
+#~ msgid ""
+#~ "You can not cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Δεν μπορείτε να ακυρώσετε μιά γραμμή εντολής πώλησης εάν έχει τιμολογηθεί!"
 
-#, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Αδύνατη η διαγραφή Εντολής(λών) Πώλησης που έχουν ήδη επιβεβαιωθεί!"
 
 #~ 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 be on the date 'Date Ordered'."
+#~ "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 be on the date 'Date Ordered'."
 #~ msgstr ""
 #~ "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 be on the date 'Date Ordered'."
+#~ "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 be on the date 'Date Ordered'."
 
-#, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
@@ -1437,23 +1629,25 @@ msgstr "Γραμμή Εντολών Πώλησης"
 #~ "Invoice after delivery'."
 
 #~ msgid ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "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 '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 Ater Delivery' choice will generate the draft "
 #~ "invoice based on sale order after all packing lists have been finished.\n"
 #~ "  - The 'Invoice from the packings' choice is used to create an invoice "
 #~ "during the packing process."
 #~ msgstr ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "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 '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 Ater Delivery' choice will generate the draft "
 #~ "invoice based on sale order after all packing lists have been finished.\n"
 #~ "  - The 'Invoice from the packings' choice is used to create an invoice "
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index c200c9f3dcb..2c8b481f34e 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -8,8 +8,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-06-23 17:33+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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"
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Pasos para entregar un pedido de venta"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Cantidad"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "¡Su factura ha sido creada correctamente!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Declaración automática"
 
@@ -161,9 +159,7 @@ msgid "Manual Designation"
 msgstr "Designación manual"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -174,8 +170,7 @@ msgid "Invoice after delivery"
 msgstr "Facturar después del envío"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impuestos"
 
@@ -235,8 +230,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
@@ -327,8 +321,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Factura basada en pedidos de venta"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Tienda de ventas"
 
@@ -343,8 +336,7 @@ msgid "Order N°"
 msgstr "Pedido Nº"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Líneas del pedido"
 
@@ -354,8 +346,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Líneas de factura"
@@ -452,15 +443,13 @@ msgid "Order Reference"
 msgstr "Referencia del pedido"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarifa"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Impuestos :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -787,8 +775,7 @@ msgid "Direct Delivery"
 msgstr "Envío directo"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Propiedades"
@@ -821,8 +808,7 @@ msgstr "Calcular"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Tienda"
 
@@ -885,8 +871,7 @@ msgid "Delivery Order Only"
 msgstr "Sólo orden de entrega"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Líneas del pedido de ventas"
 
@@ -901,8 +886,7 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
@@ -917,8 +901,7 @@ msgid "Other data"
 msgstr "Otros datos"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Precio unidad"
@@ -944,8 +927,7 @@ msgstr "Factura"
 #: 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
+#: 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"
@@ -968,8 +950,7 @@ msgstr ""
 "procese el pedido en la fecha 'Fecha del pedido'."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UdM"
 
@@ -1084,8 +1065,7 @@ msgid "Ordering Contact"
 msgstr "Contacto que realiza el pedido"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -1143,8 +1123,7 @@ msgstr ""
 "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -1156,8 +1135,7 @@ msgstr "Tarifas de compra"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Pedido de venta"
@@ -1184,8 +1162,7 @@ msgid "Total amount"
 msgstr "Importe total"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Fecha ordenada"
 
@@ -1274,8 +1251,7 @@ msgstr ""
 "línea)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Estados"
 
@@ -1295,8 +1271,7 @@ msgid "Error: Invalid ean code"
 msgstr "Error: Código EAN erróneo"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Enviada"
 
@@ -1325,3 +1300,243 @@ msgstr "Mis pedidos de ventas"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Línea pedido de venta"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tablero de ventas"
+
+#. 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"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Ventas del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Casos del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mis presupuestos abiertos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estadística de casos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Primeras diez ventas del mes"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Informe de pedidos de venta creados"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Pedidos de ventas por categoría"
+
+#. 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"
+msgstr "Movimiento mensual de ventas acumuladas sobre un año"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Pedidos de ventas por productos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Movimiento mensual de ventas sobre un año"
+
+#. 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"
+msgstr "Volumen por producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Todos los meses"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Pedidos de ventas por categorías"
+
+#. 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"
+msgstr "Ventas del mes"
+
+#. 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)"
+msgstr "Ventas por producto (este mes)"
+
+#. 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"
+msgstr "Movimiento mensual de ventas sobre un año"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Informes - Gestión de ventas"
+
+#. 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"
+msgstr "Ventas por categoría de productos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Movimiento mensual de ventas acumuladas sobre un año"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# de productos"
+
+#. 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"
+msgstr "Ventas por producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Pedidos de venta creados"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Informe"
+
+#. 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"
+msgstr "Volumen por meses"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Movimiento diario de ventas sobre un año"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Resúmenes"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Volumen total"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "En proceso"
+
+#. 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)"
+msgstr "Ventas por categoría de producto (este mes)"
+
+#. 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"
+msgstr "Movimiento diario de ventas sobre un año"
+
+#. 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"
+msgstr "Mes"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Pedidos de venta creados"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Ventas por estado"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 01d8b651cc2..2a4545cb63b 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Pasos para entregar un pedido de venta"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Cantidad"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Su factura ha sido creada satisfactoriamente !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Declaración automática"
 
@@ -160,9 +158,7 @@ msgid "Manual Designation"
 msgstr "Designación manual"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -173,8 +169,7 @@ msgid "Invoice after delivery"
 msgstr "Facturar después de la entrega"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impuestos"
 
@@ -234,8 +229,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
@@ -326,8 +320,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Factura basada en pedidos de venta"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Sucursal de Venta"
 
@@ -342,8 +335,7 @@ msgid "Order N°"
 msgstr "Orden Nº"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Líneas de la orden"
 
@@ -353,8 +345,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Líneas de Facturación"
@@ -452,15 +443,13 @@ msgid "Order Reference"
 msgstr "Referencia del pedido"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de Precios"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Impuestos :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -787,8 +775,7 @@ msgid "Direct Delivery"
 msgstr "Entrega directa"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Propiedades"
@@ -820,8 +807,7 @@ msgstr "Calcular"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Sucursal"
 
@@ -872,8 +858,7 @@ msgid "Delivery Order Only"
 msgstr "Sólo orden de entrega"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Líneas de la orden de venta"
 
@@ -888,8 +873,7 @@ msgid "Sales"
 msgstr "Ventas"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctdad"
 
@@ -904,8 +888,7 @@ msgid "Other data"
 msgstr "Otros datos"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Precio unitario"
@@ -931,8 +914,7 @@ msgstr "Factura"
 #: 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
+#: 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"
@@ -955,8 +937,7 @@ msgstr ""
 "pedido en la fecha 'Fecha del pedido'."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UdM"
 
@@ -1071,8 +1052,7 @@ msgid "Ordering Contact"
 msgstr "Contacto que realiza la orden"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -1130,8 +1110,7 @@ msgstr ""
 "El nombre y la dirección del contacto que solicita la orden o presupuesto."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -1143,8 +1122,7 @@ msgstr "Lista de precios de compra"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Orden de Venta"
@@ -1171,8 +1149,7 @@ msgid "Total amount"
 msgstr "Importe total"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Fecha ordenada"
 
@@ -1261,8 +1238,7 @@ msgstr ""
 "cada línea)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Estados"
 
@@ -1282,8 +1258,7 @@ msgid "Error: Invalid ean code"
 msgstr "Error: Código EAN erróneo"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Seleccionada"
 
@@ -1313,6 +1288,234 @@ msgstr "Mis órdenes de venta"
 msgid "Sale Order line"
 msgstr "Línea de orden de venta"
 
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tablero para ventas"
+
+#. 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"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Ventas del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Casos del mes"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mis presupuestos abiertos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estadística de casos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Primeras diez ventas del mes"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Reporte de Pedidos de venta creados"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Pedidos de ventas por categoría"
+
+#. 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"
+msgstr "Rotación mensual de ventas acumuladas sobre un año"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Pedidos de ventas por productos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Rotación mensual de ventas sobre un año"
+
+#. 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"
+msgstr "Rotación por producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Todos los meses"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Pedidos de ventas por categorías"
+
+#. 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"
+msgstr "Ventas del mes"
+
+#. 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)"
+msgstr "Ventas por producto (este mes)"
+
+#. 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"
+msgstr "Rotación mensual de ventas sobre un año"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestión de ventas - Informes"
+
+#. 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"
+msgstr "Ventas por categoría de productos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Rotación mensual de ventas acumuladas sobre un año"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# de productos"
+
+#. 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"
+msgstr "Ventas por producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Pedidos de venta creados"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Informes"
+
+#. 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"
+msgstr "Rotación por mes"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Rotación diario de ventas sobre un año"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Gráficos"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Rotación total"
+
+#. 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)"
+msgstr "Ventas por categoría de producto (este mes)"
+
+#. 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"
+msgstr "Rotación diaria de ventas sobre un año"
+
+#. 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"
+msgstr "Mes"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Pedidos de venta creados"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Ventas por provincia"
+
 #~ msgid "Customer Ref."
 #~ msgstr "Referencia de cliente"
 
@@ -1322,7 +1525,6 @@ msgstr "Línea de orden de venta"
 #~ msgid "Shop name"
 #~ msgstr "Nombre de la sucursal"
 
-#, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
@@ -1330,32 +1532,29 @@ msgstr "Línea de orden de venta"
 #~ "No puede hacer un anticipo en una orden de venta definido como 'Factura "
 #~ "automática después del envío'."
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Error !"
 
-#, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Primero debe cancelar todas las facturas asociadas a esta orden de venta."
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Acción no válida !"
 
 #~ 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 be on the date 'Date Ordered'."
+#~ "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 be on the date 'Date Ordered'."
 #~ msgstr ""
 #~ "Indica el estado del presupuesto u orden. El estado de excepción se "
-#~ "establece automáticamente cuando una operación de cancelación ocurre en la "
-#~ "validación de las facturas (Excepción de factura) o en la gestión de los "
-#~ "empaques (Excepción de envío). El estado 'Esperando fecha planificada' se "
-#~ "establece cuando la factura se confirma pero la fecha actual es anterior a "
-#~ "la 'Fecha ordenada'."
+#~ "establece automáticamente cuando una operación de cancelación ocurre en "
+#~ "la validación de las facturas (Excepción de factura) o en la gestión de "
+#~ "los empaques (Excepción de envío). El estado 'Esperando fecha "
+#~ "planificada' se establece cuando la factura se confirma pero la fecha "
+#~ "actual es anterior a la 'Fecha ordenada'."
 
 #~ msgid "Number packages"
 #~ msgstr "Número de paquetes"
@@ -1364,41 +1563,40 @@ msgstr "Línea de orden de venta"
 #~ msgstr "Manual en proceso"
 
 #~ msgid ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "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 '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 Ater Delivery' choice will generate the draft "
 #~ "invoice based on sale order after all packing lists have been finished.\n"
 #~ "  - The 'Invoice from the packings' choice is used to create an invoice "
 #~ "during the packing process."
 #~ msgstr ""
-#~ "La política de envío se utiliza para sincronizar los procesos de facturación "
-#~ "y entrega.\n"
+#~ "La política de envío se utiliza para sincronizar los procesos de "
+#~ "facturación y entrega.\n"
 #~ "  - La opción 'Pago antes de la entrega' generará primero la factura y "
 #~ "después del pago de esta factura generará el empaque.\n"
 #~ "  - La opción 'Enviar & Factura manual' creará el empaque directamente y "
-#~ "esperará a que el usuario manualmente haga clic sobre el botón de 'Factura' "
-#~ "para generar la factura borrador.\n"
+#~ "esperará a que el usuario manualmente haga clic sobre el botón de "
+#~ "'Factura' para generar la factura borrador.\n"
 #~ "  - La opción 'Facturar pedido después del envío' generará la factura "
 #~ "borrador basada en el pedido de venta después de que todos los empaques "
 #~ "hayan sido finalizados.\n"
-#~ "  - La opción 'Factura a partir de los empaques' se utiliza para crear una "
-#~ "factura durante el proceso de empaquetado."
+#~ "  - La opción 'Factura a partir de los empaques' se utiliza para crear "
+#~ "una factura durante el proceso de empaquetado."
 
 #~ msgid "In progress"
 #~ msgstr "En proceso"
 
-#, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "No pudo cancelar la orden de venta !"
 
 #~ msgid "Quantity (UOS)"
 #~ msgstr "Cantidad (UdV)"
 
-#, python-format
 #~ msgid "invalid mode for test_state"
 #~ msgstr "Modo no válido para test_state"
 
@@ -1409,14 +1607,12 @@ msgstr "Línea de orden de venta"
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shippings or not."
 #~ msgstr ""
-#~ "Si no tiene suficiente stock disponible para enviarlo todo a la vez, acepta "
-#~ "envíos parciales o no."
+#~ "Si no tiene suficiente stock disponible para enviarlo todo a la vez, "
+#~ "acepta envíos parciales o no."
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Error"
 
-#, python-format
 #~ msgid "You must first cancel all packings attached to this sale order."
 #~ msgstr ""
 #~ "Primero debe cancelar todos los empaques asociados a esta orden de venta."
@@ -1424,17 +1620,15 @@ msgstr "Línea de orden de venta"
 #~ msgid "Product UOS"
 #~ msgstr "UdV del producto"
 
-#, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "¡No se puede cancelar esta orden de venta !"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
+#~ msgid ""
+#~ "You can not cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "¡No se puede cancelar una línea de la orden de venta que ya ha sido "
 #~ "facturada!"
 
-#, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "No se puede eliminar órdenes de venta confirmadas !"
 
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 2ee52dbd72a..5bd6ba89013 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -27,8 +27,7 @@ msgid "Set to Draft"
 msgstr "Sea mustandiks"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Korralduse read"
 
@@ -64,8 +63,7 @@ msgid "Order"
 msgstr "Korraldus"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Staatused"
 
@@ -119,8 +117,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Sammud müügikorralduse kohaletoimetamiseks"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Kogus"
 
@@ -130,8 +127,7 @@ msgid "You invoice has been successfully created !"
 msgstr "sinu arve on loodud !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automaatne deklareerimine"
 
@@ -203,9 +199,7 @@ msgid "Manual Designation"
 msgstr "Käsitsi määramine"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Märkmed"
@@ -216,8 +210,7 @@ msgid "Invoice after delivery"
 msgstr "Arvelda pärast kohaletoimetamist"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Maksud"
 
@@ -277,8 +270,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Hange luuakse pärast müügikorralduse kinnitamist."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
@@ -368,8 +360,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Arve müügikorralduste põhjal"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Müügikauplus"
 
@@ -389,8 +380,7 @@ msgid "Disc.(%)"
 msgstr "Allah. (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Arve read"
@@ -482,15 +472,13 @@ msgid "Order Reference"
 msgstr "Korralduse viide"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Hinnakiri"
 
@@ -655,8 +643,7 @@ msgid "Taxes :"
 msgstr "Maksud :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Arveldatud"
 
@@ -798,8 +785,7 @@ msgid "Direct Delivery"
 msgstr "Otsetarne"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Omadused"
@@ -831,8 +817,7 @@ msgstr "Arvuta"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Pood"
 
@@ -883,8 +868,7 @@ msgid "Delivery Order Only"
 msgstr "Ainult kohaletoimetamise korraldus"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Müügikorralduste read"
 
@@ -899,8 +883,7 @@ msgid "Sales"
 msgstr "Müügid"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Kogus"
 
@@ -915,8 +898,7 @@ msgid "Other data"
 msgstr "Muud andmed"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ühiku hind"
@@ -942,8 +924,7 @@ msgstr "Arve"
 #: 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
+#: 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"
@@ -960,8 +941,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "MÜ"
 
@@ -1075,8 +1055,7 @@ msgid "Ordering Contact"
 msgstr "Tellija kontakt"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -1133,16 +1112,14 @@ msgid ""
 msgstr "Kontakti nimi ja aadress, kes taotles korraldust või hinnapakkumist."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Müügikorraldus"
@@ -1169,8 +1146,7 @@ msgid "Total amount"
 msgstr "Kogusumma"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Tellimise kuupäev"
 
@@ -1268,8 +1244,7 @@ msgid "Error: Invalid ean code"
 msgstr "Viga: Vigane EAN kood"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Nopitud"
 
@@ -1298,3 +1273,243 @@ msgstr "Minu müügikorraldus"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Müügikorralduse rida"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Töölaud müükide jaoks"
+
+#. 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"
+msgstr "Müügi töölaud"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Kuu müügid"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Müügijuhataja laud"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Kuu juhtumid"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Minu avatud hinnapakkumised"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Juhtumite statistika"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Kuu müükide top 10"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Keskmine hind"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Loodud müügikorralduse aruanne"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Müügikorraldused kategooria kaupa"
+
+#. 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"
+msgstr "Kuu kumuleeritud müükide käive ühe aasta jooksul"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Müügikorraldused toodete kaupa"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Kuu müükide käive ühe aasta jooksul"
+
+#. 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"
+msgstr "Käive toote kohta"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Kõik kuud"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Hind kokku"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Müügikorraldused kategooria kaupa"
+
+#. 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"
+msgstr "Kuu müügid"
+
+#. 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)"
+msgstr "Müügid toote kaupa (see kuu)"
+
+#. 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"
+msgstr "Kuu müükide käive ühe aasta jooksul"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Müügihaldus - Aruandlus"
+
+#. 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"
+msgstr "Müügid toote kategooriate kaupa"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Kuu kumuleeritud müükide käive ühe aasta jooksul"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Toodete arv"
+
+#. 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"
+msgstr "Müügid toodete kaupa"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Käesolev kuu"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategooriad"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Loodud müügikorraldused"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Aruandlus"
+
+#. 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"
+msgstr "Käive kuu kohta"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Päeva müükide käive ühe aasta jooksul"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Graafikud"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Edenemisel käsitsi"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Kogu käive"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "Töös"
+
+#. 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)"
+msgstr "Müügid toote kategooriate kaupa (see kuu)"
+
+#. 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"
+msgstr "Päeva müükide käive ühe aasta jooksul"
+
+#. 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"
+msgstr "Kuu"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Ridade arv"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Loomise kuupäev"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Loodud müügikorraldused"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Müügid oleku kaupa"
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index b7d8e4a8b02..c8c31129689 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Vaiheet myyntitilauksen toimittamiseksi"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Määrä"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Laskun luominen onnistui!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automaattinen ilmoitus"
 
@@ -159,9 +157,7 @@ msgid "Manual Designation"
 msgstr "Käsin syötetty nimike"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Huomautukset"
@@ -172,8 +168,7 @@ msgid "Invoice after delivery"
 msgstr "Lasku toimituksen jälkeen"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Verot"
 
@@ -233,8 +228,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Hankinta luodaan myyntitilauksen vahvistamisen jälkeen."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analyyttinen tili"
 
@@ -324,8 +318,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Lasku perustuu myyntitilauksiin"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Myymälä"
 
@@ -340,8 +333,7 @@ msgid "Order N°"
 msgstr "Tilaus no."
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Tilausrivit"
 
@@ -351,8 +343,7 @@ msgid "Disc.(%)"
 msgstr "Alennus (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Laskurivit"
@@ -393,8 +384,8 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
-"Kun valitset toimituskäytännöksi \"Automaattinen lasku toimituksen "
-"jälkeen\", lasku luodaan automaattisesti toimituksen jälkeen."
+"Kun valitset toimituskäytännöksi \"Automaattinen lasku toimituksen jälkeen"
+"\", lasku luodaan automaattisesti toimituksen jälkeen."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -449,15 +440,13 @@ msgid "Order Reference"
 msgstr "Tilauksen viite"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Hinnasto"
 
@@ -628,8 +617,7 @@ msgid "Taxes :"
 msgstr "Verot:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Laskutettu"
 
@@ -784,8 +772,7 @@ msgid "Direct Delivery"
 msgstr "Suora toimitus"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Ominaisuudet"
@@ -807,8 +794,8 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
-"Lasku luodaan myyntitilauksen vahvistamisen jälkeen kun painetaan \"Luo "
-"lasku\". Tämä toiminto siirtää myyntitilauksen laskutukseen."
+"Lasku luodaan myyntitilauksen vahvistamisen jälkeen kun painetaan \"Luo lasku"
+"\". Tämä toiminto siirtää myyntitilauksen laskutukseen."
 
 #. module: sale
 #: view:sale.order:0
@@ -817,8 +804,7 @@ msgstr "Laske"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Myymälä"
 
@@ -869,8 +855,7 @@ msgid "Delivery Order Only"
 msgstr "Vain toimitusmääräys"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Myyntitilauksen rivit"
 
@@ -885,8 +870,7 @@ msgid "Sales"
 msgstr "Myynti"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Määrä"
 
@@ -901,8 +885,7 @@ msgid "Other data"
 msgstr "Muut tiedot"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Yksikköhinta"
@@ -928,8 +911,7 @@ msgstr "Lasku"
 #: 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
+#: 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"
@@ -951,8 +933,7 @@ msgstr ""
 "hyväksytty mutta tilaus odottaa \"Tilauspäivämäärän\" mukaista ajankohtaa."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Mittayksikkö"
 
@@ -1065,8 +1046,7 @@ msgid "Ordering Contact"
 msgstr "Tilauskontakti"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -1123,8 +1103,7 @@ msgid ""
 msgstr "Tilauksen tai tarjouksen pyytäneen kontaktin nimi ja osoite."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Asiakas"
 
@@ -1136,8 +1115,7 @@ msgstr "Ostohinnastot"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Myyntitilaus"
@@ -1164,8 +1142,7 @@ msgid "Total amount"
 msgstr "Yhteensä"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Tilauspäivämäärä"
 
@@ -1254,8 +1231,7 @@ msgstr ""
 "rivikohtaisesti)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Tilat"
 
@@ -1275,8 +1251,7 @@ msgid "Error: Invalid ean code"
 msgstr "Virhe: Virheellinen EAN-koodi"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Kerätty"
 
@@ -1306,6 +1281,193 @@ msgstr "Omat myyntitilaukset"
 msgid "Sale Order line"
 msgstr "Myyntitilausrivi"
 
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Keskihinta"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Luotujen myyntilausten raportti"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Myyntitilaukset kategorioittain"
+
+#. 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"
+msgstr "Kumulatiivinen myynti kuukausittain vuoden ajalta"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Myyntitilaukset tuotteittain"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Myynti kuukausittain vuoden ajalta"
+
+#. 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"
+msgstr "Liikevaihto tuotetta kohden"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Kaikki kuukaudet"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Hinta yhteensä"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Myyntitilaukset kategorioittain"
+
+#. 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"
+msgstr "Kuukauden myynti"
+
+#. 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)"
+msgstr "Myynti tuotteittain (kuluva kuukausi)"
+
+#. 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"
+msgstr "Liikevaihto kuukausittain vuoden ajalta"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Myynnin hallinta - Raportointi"
+
+#. 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"
+msgstr "Myynti tuoteluokittain"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Kumulatiivinen myynnin kuukausittainen liikevaihto vuoden ajalta"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Tuotteiden lukumäärä"
+
+#. 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"
+msgstr "Myynti tuotteittain"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Tässä kuussa"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategoriat"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Luodut myyntitilaukset"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Raportointi"
+
+#. 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"
+msgstr "Liikevaihto kuukausittain"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Päivittäinen liikevaihto vuoden ajalta"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Kuvaajat"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Liikevaihto yhteensä"
+
+#. 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)"
+msgstr "Myynti tuoteluokittain (kuluva kuukausi)"
+
+#. 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"
+msgstr "Päivittäinen liikevaihto vuoden ajalta"
+
+#. 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"
+msgstr "Kuukausi"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Rivien lukumäärä"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Luontipäivämäärä"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Luodut myyntitilaukset"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Myynti tiloittain"
+
 #~ msgid "Customer Ref."
 #~ msgstr "Asiakkaan viite"
 
@@ -1315,25 +1477,24 @@ msgstr "Myyntitilausrivi"
 #~ msgid "Shop name"
 #~ msgstr "Myymälän nimi"
 
-#, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
 #~ msgstr ""
-#~ "Ennakkoa ei voi tehdä myyntitilauksesta johon on määritelty \"Automaattinen "
-#~ "lasku toimituksen jälkeen\"."
+#~ "Ennakkoa ei voi tehdä myyntitilauksesta johon on määritelty "
+#~ "\"Automaattinen lasku toimituksen jälkeen\"."
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "Virhe!"
 
 #~ msgid ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "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 '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 Ater Delivery' choice will generate the draft "
 #~ "invoice based on sale order after all packing lists have been finished.\n"
 #~ "  - The 'Invoice from the packings' choice is used to create an invoice "
@@ -1342,11 +1503,12 @@ msgstr "Myyntitilausrivi"
 #~ "Toimituskäytännöllä tarkoitetaan laskutuksen yhdistämistä toimitukseen.\n"
 #~ "  - \"Maksu ennen toimitusta\" luo ensin laskun; pakkausmääräys luodaan "
 #~ "vasta sen jälkeen kun lasku on maksettu.\n"
-#~ "  - \"Toimitus ja manuaalinen lasku\" luo heti pakkausmääräyksen ja odottaa "
-#~ "että käyttäjä luo laskun luonnoksen painamalla \"Lasku\".\n"
+#~ "  - \"Toimitus ja manuaalinen lasku\" luo heti pakkausmääräyksen ja "
+#~ "odottaa että käyttäjä luo laskun luonnoksen painamalla \"Lasku\".\n"
 #~ "  - \"Lasku toimituksen jälkeen\" luo laskun luonnoksen kun kaikki "
 #~ "pakkauslistat ovat valmiit.\n"
-#~ "  - \"Lasku pakatuista\" luo laskun samanaikaisesti pakkausprosessin aikana."
+#~ "  - \"Lasku pakatuista\" luo laskun samanaikaisesti pakkausprosessin "
+#~ "aikana."
 
 #~ msgid "Canceled"
 #~ msgstr "Peruutettu"
@@ -1354,26 +1516,24 @@ msgstr "Myyntitilausrivi"
 #~ msgid "Related Packings"
 #~ msgstr "Liittyvät pakatut"
 
-#, python-format
 #~ msgid "You must first cancel all packings attached to this sale order."
 #~ msgstr ""
-#~ "Sinun täytyy ensin peruuttaa kaikki tähän myyntitilaukseen liitetyt pakatut."
+#~ "Sinun täytyy ensin peruuttaa kaikki tähän myyntitilaukseen liitetyt "
+#~ "pakatut."
 
-#, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Sinun täytyy ensin peruuttaa kaikki myyntitilaukseen liittyvät laskut"
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Virheellinen toiminto!"
 
 #~ 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 be on the date 'Date Ordered'."
+#~ "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 be on the date 'Date Ordered'."
 #~ msgstr ""
 #~ "Antaa tarjouksen tai myyntitilauksen tilan. Poikkeustila asetetaan "
 #~ "automaattisesti kun peruutus tapahtuu laskun vahvistuksessa (Poikkeus "
@@ -1387,7 +1547,6 @@ msgstr "Myyntitilausrivi"
 #~ msgid "In progress"
 #~ msgstr "Käsittelyssä"
 
-#, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Myyntitilausta ei voitu peruuttaa!"
 
@@ -1395,18 +1554,16 @@ msgstr "Myyntitilausrivi"
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shippings or not."
 #~ msgstr ""
-#~ "Jos tuotetta ei ole tarpeeksi varastossa tilauksen toimittamiseen kerralla, "
-#~ "hyväksytäänkö osittaistoimitukset vai ei?"
+#~ "Jos tuotetta ei ole tarpeeksi varastossa tilauksen toimittamiseen "
+#~ "kerralla, hyväksytäänkö osittaistoimitukset vai ei?"
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "Virhe"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
+#~ msgid ""
+#~ "You can not cancel a sale order line that has already been invoiced !"
 #~ msgstr "Laskutettua myyntitilauksen rivia ei voi peruuttaa!"
 
-#, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Vahvistettuja myyntitilauksia ei voi poistaa!"
 
@@ -1416,11 +1573,9 @@ msgstr "Myyntitilausrivi"
 #~ msgid "Quantity (UOS)"
 #~ msgstr "Määrä (myyntiyksikköä)"
 
-#, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Myyntitilausta ei voitu peruuttaa!"
 
-#, python-format
 #~ msgid "invalid mode for test_state"
 #~ msgstr "invalid mode for test_state"
 
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index c1350bf4ddc..4389f870d8d 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -89,8 +89,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Étapes pour livrer une commande"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -100,8 +99,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Votre facture a été créée avec succès !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Déclaration automatique"
 
@@ -179,9 +177,7 @@ msgid "Manual Designation"
 msgstr "Désignation manuelle"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notes"
@@ -192,8 +188,7 @@ msgid "Invoice after delivery"
 msgstr "Facture après livraison"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Taxes"
 
@@ -253,8 +248,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Un approvisionnement est demandé après confirmation de commande."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Compte analytique"
 
@@ -345,8 +339,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Facturation basée sur les commandes"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Point de vente"
 
@@ -361,8 +354,7 @@ msgid "Order N°"
 msgstr "N° de commande"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Lignes de la commande"
 
@@ -372,8 +364,7 @@ msgid "Disc.(%)"
 msgstr "Rem.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Lignes de facture"
@@ -470,15 +461,13 @@ msgid "Order Reference"
 msgstr "Référence commande"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Terminée"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Liste de prix"
 
@@ -644,8 +633,7 @@ msgid "Taxes :"
 msgstr "Taxes :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturé"
 
@@ -792,8 +780,7 @@ msgid "Direct Delivery"
 msgstr "Livraison directe"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Propriétés"
@@ -815,8 +802,8 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
-"La facture est créée quand on clique sur le bouton « Créer la facture » "
-"après confirmation de la commande du client."
+"La facture est créée quand on clique sur le bouton « Créer la facture » après "
+"confirmation de la commande du client."
 
 #. module: sale
 #: view:sale.order:0
@@ -825,8 +812,7 @@ msgstr "Calculer"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Magasin"
 
@@ -877,8 +863,7 @@ msgid "Delivery Order Only"
 msgstr "Ordre de livraison seulement"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Ligne de commande"
 
@@ -893,8 +878,7 @@ msgid "Sales"
 msgstr "Ventes"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Qté"
 
@@ -909,8 +893,7 @@ msgid "Other data"
 msgstr "Autres informations"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Prix unitaire"
@@ -936,8 +919,7 @@ msgstr "Facture"
 #: 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
+#: 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"
@@ -960,8 +942,7 @@ msgstr ""
 "à la Date de la Commande."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UdM"
 
@@ -1076,8 +1057,7 @@ msgid "Ordering Contact"
 msgstr "Adresse de commande"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Description"
 
@@ -1134,8 +1114,7 @@ msgid ""
 msgstr "Le nom et l'adresse du contacte ayant demandé le devis."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Client"
 
@@ -1147,8 +1126,7 @@ msgstr "Liste de prix d'achats"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Commande client"
@@ -1175,8 +1153,7 @@ msgid "Total amount"
 msgstr "Montant total"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Date de commande"
 
@@ -1260,8 +1237,7 @@ msgstr ""
 "exemple)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "États"
 
@@ -1281,8 +1257,7 @@ msgid "Error: Invalid ean code"
 msgstr "Erreur: code EAN invalide"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Réceptionné"
 
@@ -1311,3 +1286,243 @@ msgstr "Mes commandes"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Ligne de commande"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tableau de Bord des Ventes"
+
+#. 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"
+msgstr "Tableau de Bord des Ventes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Ventes du Mois"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Tableau de Bord du Gestionnaire des Ventes"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Cas du Mois"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mes Devis Ouverts"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Statistiques des Cas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "10 meilleures Ventes du Mois"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Prix moyen"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Rapport sur les commandes crées"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Commandes de vente par catégorie"
+
+#. 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"
+msgstr "Chiffres d'affaires cumulés mensuels des ventes sur un an"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Commandes de vente par produit"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Chiffres d'affaires mensuels sur un an"
+
+#. 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"
+msgstr "Chiffres d'affaires par produit"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Tous les mois"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Prix total"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Commandes de vente par catégorie"
+
+#. 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"
+msgstr "Ventes du mois"
+
+#. 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)"
+msgstr "Ventes par produit (ce mois)"
+
+#. 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"
+msgstr "Chiffres d'affaires mensuels sur un an"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestion des ventes - Rapports"
+
+#. 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"
+msgstr "Ventes par catégorie de produits"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Chiffres d'affaires mensuel des ventes cumulés depuis un an"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# de Produits"
+
+#. 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"
+msgstr "Ventes par produit"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Ce mois"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Catégories"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Commandes crées"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Rapports"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Chiffres d'affaires journalier depuis un an"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Graphiques"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manuelle en cours"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Chiffre d'affaire total"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "En cours"
+
+#. 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)"
+msgstr "Ventes par catégorie de produits (ce mois)"
+
+#. 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"
+msgstr "Chiffres d'affaires journalier sur un an"
+
+#. 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"
+msgstr "Mois"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Nb. de lignes"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Date de création"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Commandes de vente créées"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Ventes par état"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index daf4ffc82ba..0249757edf0 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Koraci do isporuke Prodajne Narudžbe"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Vaš je račun uspješno kreiran!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automatska Deklaracija"
 
@@ -161,9 +159,7 @@ msgid "Manual Designation"
 msgstr "Ručno Doznačivanje"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Bilješke"
@@ -174,8 +170,7 @@ msgid "Invoice after delivery"
 msgstr "Račun nakon isporuke"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Porezi"
 
@@ -235,8 +230,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Nabava je kreirana po potvrdi Prodajne Narudžbe"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analitički konto"
 
@@ -326,8 +320,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Račun temeljen na Prodajnim Narudžbama"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Dućan prodaje"
 
@@ -342,8 +335,7 @@ msgid "Order N°"
 msgstr "Narudžba broj"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Vezane Prodajne Narudžbe"
 
@@ -353,8 +345,7 @@ msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Vezani Računi"
@@ -451,15 +442,13 @@ msgid "Order Reference"
 msgstr "Referenca Narudžbe"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Gotovo"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cjenik"
 
@@ -629,8 +618,7 @@ msgid "Taxes :"
 msgstr "Porezi :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Izdan Račun"
 
@@ -674,8 +662,7 @@ msgstr "Napravi Račune"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
+msgstr "Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
@@ -782,8 +769,7 @@ msgid "Direct Delivery"
 msgstr "Izravna Isporuka"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Svojstva"
@@ -815,8 +801,7 @@ msgstr "Izračunaj"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Dućan"
 
@@ -878,8 +863,7 @@ msgid "Delivery Order Only"
 msgstr "Samo Nalog za Isporuku"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Vezane Prodajne Narudžbe"
 
@@ -894,8 +878,7 @@ msgid "Sales"
 msgstr "Prodaje"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Količina"
 
@@ -910,8 +893,7 @@ msgid "Other data"
 msgstr "Drugi podaci"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Jedinična cijena"
@@ -937,8 +919,7 @@ msgstr "Račun"
 #: 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
+#: 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"
@@ -960,8 +941,7 @@ msgstr ""
 "na Rsporedniku pojavi \" Datum Narudžbe\"."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UoM"
 
@@ -1075,8 +1055,7 @@ msgid "Ordering Contact"
 msgstr "Osoba za kontakt kod naručivanja"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -1133,8 +1112,7 @@ msgid ""
 msgstr "Ime i adresa kontakta koji je zatražio Prodajnu Narudžnu ili Ponudu."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Stranka"
 
@@ -1146,8 +1124,7 @@ msgstr "Kupovni cjenici"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Prodajna narudžba"
@@ -1174,8 +1151,7 @@ msgid "Total amount"
 msgstr "Ukupni iznos"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Datum narudžbe"
 
@@ -1263,8 +1239,7 @@ msgstr ""
 "linijama, na primjer)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Stanja"
 
@@ -1284,8 +1259,7 @@ msgid "Error: Invalid ean code"
 msgstr "Greška: Nepravilan ean kod"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Odabran"
 
@@ -1314,3 +1288,243 @@ msgstr "Moja Prodajna narudžba"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Vezane Prodajne Narudžbe"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Prosječna cijena"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Izvještaj o kreiranoj Prodajnoj narudžbi"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Prodajne narudžbe prema Kategoriji"
+
+#. 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"
+msgstr "Kumulativni promet prodaje po mjesecima u godini"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Prodajne narudžbe prema Proizvodima"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Mjesečni promet prodaje tijekom jedne godine"
+
+#. 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"
+msgstr "Promet po Proizvodu"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Svi mjeseci"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Ukupna cijena"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Prodajne narudžbe prema Kategorijama"
+
+#. 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"
+msgstr "Prodaje u mjesecu"
+
+#. 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)"
+msgstr "Prodaje prema Proizvodima (Ovaj mjesec)"
+
+#. 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"
+msgstr "Mjesečni promet prodaje tijekom jedne godine"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Upravljanje prodajom - Izvještavanje"
+
+#. 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"
+msgstr "Prodaje prema Kategorijama Proizvoda"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Kumulativni promet prodaje po mjesecima u godini"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# Proizvoda"
+
+#. 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"
+msgstr "prodaja prema Proizvodu"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Ovaj mjesec"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "kategorije"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Kreirane Prodajne Narudžbe"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Izvještavanje"
+
+#. 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"
+msgstr "Promet po mjesecu"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Dnevni promet prodaje tijekom jedne godine"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Grafikoni"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Priručnik u tijeku"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Ukupni promet"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "U Tijeku"
+
+#. 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)"
+msgstr "Prodaje prema Kategoriji Proizvoda (Ovaj mjesec)"
+
+#. 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"
+msgstr "Dnevni promet prodaje tijekom jedne godine"
+
+#. 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"
+msgstr "Mjesec"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# Linija"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Kreiraj datum"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Kreirane Prodajne Narudžbe"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Prodaje prema Stanju"
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index d016ffd6e0f..7167b3b3fd5 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr ""
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Jegyzetek"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr ""
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Projekt"
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ msgstr "Számítás"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -861,13 +846,12 @@ msgid "Sequence"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "Eladás"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,8 +1077,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 97efbb9fd7b..0b02559c062 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -72,8 +72,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Kwantitas"
 
@@ -83,8 +82,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Invoice berhasil dibuat"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Keterangan Otomatis"
 
@@ -159,9 +157,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Catatan"
@@ -172,8 +168,7 @@ msgid "Invoice after delivery"
 msgstr "Ditagihkan setelah pengiriman"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Pajak-pajak"
 
@@ -233,8 +228,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Pengadaan dibuat setelah order penjualan dikonfirmasi"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Akun Analisis"
 
@@ -283,10 +277,10 @@ msgid ""
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
 "Order Penjualan sebara otomatis akan membuat konsep invoice. Kwantitas yang "
-"diorder dan yang terkirim mungkin tidak sama. Anda harus memilih, "
-"tagihan/invoice berdasarkan order atau kwantitas barang yang terkirim. Jika "
-"produk adalah jasa, maksud dari kwantitas yang terkirim adalah jumlah jam "
-"yang telah ditempuh dalam suatu pekerjaan"
+"diorder dan yang terkirim mungkin tidak sama. Anda harus memilih, tagihan/"
+"invoice berdasarkan order atau kwantitas barang yang terkirim. Jika produk "
+"adalah jasa, maksud dari kwantitas yang terkirim adalah jumlah jam yang "
+"telah ditempuh dalam suatu pekerjaan"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -325,8 +319,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Toko"
 
@@ -341,8 +334,7 @@ msgid "Order N°"
 msgstr "No. Order"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Baris Order"
 
@@ -352,8 +344,7 @@ msgid "Disc.(%)"
 msgstr "Potongan (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Detail Invoice"
@@ -446,15 +437,13 @@ msgid "Order Reference"
 msgstr "Referensi Order"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Selesai"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Harga"
 
@@ -623,8 +612,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Terinvoice"
 
@@ -777,8 +765,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -808,8 +795,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -860,8 +846,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -876,8 +861,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -892,8 +876,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -919,8 +902,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -937,8 +919,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1049,8 +1030,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1107,8 +1087,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1120,8 +1099,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1148,8 +1126,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1231,8 +1208,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1252,8 +1228,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1282,3 +1257,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: board_sale
+#: model:ir.module.module,shortdesc:board_sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr ""
+
+#. module: board_sale
+#: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
+#: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
+msgid "Sale Dashboard"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Semua Bulan"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Bulan Ini"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Pelaporan"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index bec974430e8..58bdfdb8804 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Procedura per fornire un ordine di vendita"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Quantità"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "La tua fattura è stata creata con successo!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Definizione Automatica"
 
@@ -160,9 +158,7 @@ msgid "Manual Designation"
 msgstr "Assegnazione Manuale"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Note"
@@ -173,8 +169,7 @@ msgid "Invoice after delivery"
 msgstr "Fattura a consegna avvenuta"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Tasse"
 
@@ -234,8 +229,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "L'approvvigionamento è creato dopo la conferma di vendita ordine."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Contabilità Analitica"
 
@@ -326,8 +320,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Fattura basata su Ordini di Vendita"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Negozio di Vendita"
 
@@ -342,8 +335,7 @@ msgid "Order N°"
 msgstr "Ordine N°"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Righe Ordine"
 
@@ -353,8 +345,7 @@ msgid "Disc.(%)"
 msgstr "Sconto (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Righe Fattura"
@@ -452,15 +443,13 @@ msgid "Order Reference"
 msgstr "Rif. Ordine"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Completato"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Listino Prezzi"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Tasse"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Fatturato"
 
@@ -787,8 +775,7 @@ msgid "Direct Delivery"
 msgstr "Consegna Diretta"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Proprietà"
@@ -821,8 +808,7 @@ msgstr "Calcola"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Negozio"
 
@@ -884,8 +870,7 @@ msgid "Delivery Order Only"
 msgstr "Solo consegna"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Righe Ordine di Vendita"
 
@@ -900,8 +885,7 @@ msgid "Sales"
 msgstr "Vendite"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Qta'"
 
@@ -916,8 +900,7 @@ msgid "Other data"
 msgstr "Altri Dati"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Prezzo unitario"
@@ -943,8 +926,7 @@ msgstr "Fattura"
 #: 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
+#: 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"
@@ -961,8 +943,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Unità di Misura"
 
@@ -1077,8 +1058,7 @@ msgid "Ordering Contact"
 msgstr "Contatto Ordinante"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1135,8 +1115,7 @@ msgid ""
 msgstr "Nome e indirizzo del contatto che ha richiesto il preventivo/ordine"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -1148,8 +1127,7 @@ msgstr "Listini di Acquisto"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Ordine di Vendita"
@@ -1176,8 +1154,7 @@ msgid "Total amount"
 msgstr "Importo Totale"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data ordine"
 
@@ -1187,9 +1164,9 @@ msgid "Product UoS"
 msgstr "Unità di Vendita Prodotto"
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Manuale in Progresso"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1212,8 +1189,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sale Order"
-msgstr ""
-"Configura le Politiche di Preparazione Merci per gli Ordini di Vendita"
+msgstr "Configura le Politiche di Preparazione Merci per gli Ordini di Vendita"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
@@ -1267,8 +1243,7 @@ msgstr ""
 "(Es: per righe)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Stati"
 
@@ -1288,8 +1263,7 @@ msgid "Error: Invalid ean code"
 msgstr "Errore: codice EAN non valido"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Prelevato"
 
@@ -1318,3 +1292,243 @@ msgstr "I Miei Ordini di Vendita"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Riga Ordine di Vendita"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Cruscotto per le vendite"
+
+#. 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"
+msgstr "Cruscotto Vendite"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Vendite del Mese"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Dashboard Sales Manager"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Casi del Mese"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Le Mie Domande Aperte"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Statistiche Casi"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Le migliori 10 vendite del mese"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Prezzo Medio"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Relazione sugli Ordini di Vendita Creati"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Ordini di Vendita per Categoria"
+
+#. 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"
+msgstr "Totale cumulativo Vendite Mensili per un anno"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Ordini di Vendita per Prodotto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Ammontare Vendite mensili dopo un anno"
+
+#. 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"
+msgstr "Turnover per Prodotto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Tutti i Mesi"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Prezzo Totale"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Ordini di vendita per Categoria"
+
+#. 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"
+msgstr "Vendite del mese"
+
+#. 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)"
+msgstr "Vendite per Prodotto (questo mese)"
+
+#. 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"
+msgstr "Ammontare complessivo vendite mensili dopo un anno"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestione vendite - Segnalazione"
+
+#. 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"
+msgstr "Vendite per categoria di Prodotto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Ammontare cumulativo Vendite mensili dopo un anno"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Numero Prodotti"
+
+#. 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"
+msgstr "Vendite per Prodotto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Questo Mese"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categorie"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Creazione Ordine di Vendita"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Reportistica"
+
+#. 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"
+msgstr "Turnover per Mese"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Ammontare Vendite giornaliere dopo un anno"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Grafici"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Progressione Manuale"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Turnover Totale"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "In corso"
+
+#. 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)"
+msgstr "Vendite per categoria di Prodotto (questo mese)"
+
+#. 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"
+msgstr "Ammontare Vendite giornaliere dopo un anno"
+
+#. 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"
+msgstr "Mese"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Numero Righe"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Data Creazione"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Ordini di Vendita Creati"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Stao delle Vendite"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index f3a4b731b89..3bbaaac5210 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -70,8 +70,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "판매 주문 전달을 위한 단계들"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "수량"
 
@@ -81,8 +80,7 @@ msgid "You invoice has been successfully created !"
 msgstr "인보이스가 생성되었습니다 !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "자동 선언"
 
@@ -138,7 +136,9 @@ msgstr "소계"
 msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
-msgstr "확정 버튼이 클릭될 때 마다, 초안 상태가 매뉴얼로 이동합니다. 즉, 견적이 판매 주문으로 이동합니다."
+msgstr ""
+"확정 버튼이 클릭될 때 마다, 초안 상태가 매뉴얼로 이동합니다. 즉, 견적이 판매 "
+"주문으로 이동합니다."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -157,9 +157,7 @@ msgid "Manual Designation"
 msgstr "매뉴얼 목적지"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "노트"
@@ -170,8 +168,7 @@ msgid "Invoice after delivery"
 msgstr "배송 뒤 인보이스"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "세금"
 
@@ -231,8 +228,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "판매 주문 확정 후에 조달이 생성됩니다."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "분석 계정"
 
@@ -280,9 +276,10 @@ msgid ""
 "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."
 msgstr ""
-"판매 주문은 자동적으로 인보이스 제안서 (초안 인보이스)를 생성합니다. 주문과 배송 수량이 일치하지 않을 수도 있습니다. 귀하는 주문 "
-"또는 선적 수량 중 인보이스의 토대가 될 오브젝트를 선택할 수 있습니다. 서비스 상품의 경우, 선적 수량은 관련 작업에 소요된 시간을 "
-"의미합니다."
+"판매 주문은 자동적으로 인보이스 제안서 (초안 인보이스)를 생성합니다. 주문과 "
+"배송 수량이 일치하지 않을 수도 있습니다. 귀하는 주문 또는 선적 수량 중 인보이"
+"스의 토대가 될 오브젝트를 선택할 수 있습니다. 서비스 상품의 경우, 선적 수량"
+"은 관련 작업에 소요된 시간을 의미합니다."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -321,8 +318,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "판매 주문에 기초한 인보이스"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "판매 샵"
 
@@ -337,8 +333,7 @@ msgid "Order N°"
 msgstr "주문 N°"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "주문 라인"
 
@@ -348,8 +343,7 @@ msgid "Disc.(%)"
 msgstr "Disc.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "인보이스 라인"
@@ -370,7 +364,8 @@ msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
 msgstr ""
-"판매 주문을 확정한 뒤, '할당'을 클릭하면 포장 리스트가 생성됩니다. 이 트랜젝션은 판매 주문을 포잘 리스트로 이동합니다."
+"판매 주문을 확정한 뒤, '할당'을 클릭하면 포장 리스트가 생성됩니다. 이 트랜젝"
+"션은 판매 주문을 포잘 리스트로 이동합니다."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
@@ -388,7 +383,9 @@ msgstr "선적 주소:"
 msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
-msgstr "선적 정책을 '배송 뒤 자동 인보이스'로 선택하면, 배송 뒤 인보이스를 자동 생성합니다."
+msgstr ""
+"선적 정책을 '배송 뒤 자동 인보이스'로 선택하면, 배송 뒤 인보이스를 자동 생성"
+"합니다."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -443,15 +440,13 @@ msgid "Order Reference"
 msgstr "주문 참조"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "완료"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "가격리스트"
 
@@ -620,8 +615,7 @@ msgid "Taxes :"
 msgstr "세금:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "인보이스됨"
 
@@ -772,8 +766,7 @@ msgid "Direct Delivery"
 msgstr "직접 배송"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "속성"
@@ -795,7 +788,8 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
-"판매 주문을 확정한 뒤, '인보이스 생성'을 클릭하면 인보이스가 생성됩니다. 이 트랜젝션은 판매 주문을 인보이스로 이동합니다."
+"판매 주문을 확정한 뒤, '인보이스 생성'을 클릭하면 인보이스가 생성됩니다. 이 "
+"트랜젝션은 판매 주문을 인보이스로 이동합니다."
 
 #. module: sale
 #: view:sale.order:0
@@ -804,8 +798,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "샵"
 
@@ -856,8 +849,7 @@ msgid "Delivery Order Only"
 msgstr "배송주문 만"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "판매 주문 라인"
 
@@ -872,8 +864,7 @@ msgid "Sales"
 msgstr "판매"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "수량"
 
@@ -888,8 +879,7 @@ msgid "Other data"
 msgstr "기타 데이터"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "유닛 가격"
@@ -915,8 +905,7 @@ msgstr "인보이스"
 #: 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
+#: 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"
@@ -933,8 +922,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UoM"
 
@@ -948,7 +936,9 @@ msgstr ""
 msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
-msgstr "포장 리스트를 확정하면 배송 주문이 생성됩니다. 이를 위해서는 '검증' 버튼을 클릭하십시오."
+msgstr ""
+"포장 리스트를 확정하면 배송 주문이 생성됩니다. 이를 위해서는 '검증' 버튼을 클"
+"릭하십시오."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1045,8 +1035,7 @@ msgid "Ordering Contact"
 msgstr "주문 접촉"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "설명"
 
@@ -1103,8 +1092,7 @@ msgid ""
 msgstr "주문 또는 견적을 요청한 이의 이름과 주소"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "고객"
 
@@ -1116,8 +1104,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "판매 주문"
@@ -1144,8 +1131,7 @@ msgid "Total amount"
 msgstr "총 금액"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "주문 날짜"
 
@@ -1172,8 +1158,9 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
-"디폴트로, 시스템은 귀하의 창고와 파트너 위치에 있는 상품들의 복잡한 라우팅과 결오를 관리할 수 있습니다. 이것은 작업자의 한 두 가지 "
-"오퍼레이션을 통해 고객에게 상품을 전달할 가장 일반적이고 간편한 방식을 구성하게 됩니다."
+"디폴트로, 시스템은 귀하의 창고와 파트너 위치에 있는 상품들의 복잡한 라우팅과 "
+"결오를 관리할 수 있습니다. 이것은 작업자의 한 두 가지 오퍼레이션을 통해 고객"
+"에게 상품을 전달할 가장 일반적이고 간편한 방식을 구성하게 됩니다."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
@@ -1227,11 +1214,11 @@ msgid ""
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
-"이 판매 주문을 위해 생성된 인보이스들의 목록입니다. 동일한 판매 주문이 여러 차례 인보이스들을 생성할 수도 있습니다 (가령, 라인 별)."
+"이 판매 주문을 위해 생성된 인보이스들의 목록입니다. 동일한 판매 주문이 여러 "
+"차례 인보이스들을 생성할 수도 있습니다 (가령, 라인 별)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "상태"
 
@@ -1251,8 +1238,7 @@ msgid "Error: Invalid ean code"
 msgstr "에러: 유효하지 않은 EAN 코드"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "인수됨"
 
@@ -1282,6 +1268,47 @@ msgstr "내 판매 주문"
 msgid "Sale Order line"
 msgstr "판매 주문 라인"
 
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "판매 대시보드"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "월간 판매"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "판매 매니저 보드"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "월간 케이스"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "내 오픈 견적들"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "케이스 통계"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "월간 10대 판매량"
+
 #~ msgid "Customer Ref."
 #~ msgstr "고객 참조"
 
@@ -1291,56 +1318,60 @@ msgstr "판매 주문 라인"
 #~ msgid "Shop name"
 #~ msgstr "샵 이름"
 
-#, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
-#~ msgstr "'배송 뒤 자동 인보이스'로 정의된 판매 주문에 대해 선급금을 처리할 수 없습니다."
+#~ msgstr ""
+#~ "'배송 뒤 자동 인보이스'로 정의된 판매 주문에 대해 선급금을 처리할 수 없습"
+#~ "니다."
 
-#, python-format
 #~ msgid "Error !"
 #~ msgstr "에러 !"
 
-#, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "판매 주문에 첨부된 모든 인보이스를 먼저 취소하십시오."
 
-#, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "유효하지 않은 액션 !"
 
 #~ 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 be on the date 'Date Ordered'."
+#~ "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 be on the date 'Date Ordered'."
 #~ msgstr ""
-#~ "인용 상태 또는 판매 주문을 제공합니다. 예외 상태는 인보이스 검증 또는 포장 리스트 프로세스 (선적 예외)에서 취소 오퍼레이션이 발생할 "
-#~ "때, 자동적으로 설정됩니다. '스케줄 대기' 상태는 인보이스가 확정되었지만, 스케줄러가 '주문 날짜'에 이를 때를 기다릴 때 설정됩니다."
+#~ "인용 상태 또는 판매 주문을 제공합니다. 예외 상태는 인보이스 검증 또는 포"
+#~ "장 리스트 프로세스 (선적 예외)에서 취소 오퍼레이션이 발생할 때, 자동적으"
+#~ "로 설정됩니다. '스케줄 대기' 상태는 인보이스가 확정되었지만, 스케줄러가 "
+#~ "'주문 날짜'에 이를 때를 기다릴 때 설정됩니다."
 
 #~ msgid "Number packages"
 #~ msgstr "패키지 수"
 
 #~ msgid ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "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 '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 Ater Delivery' choice will generate the draft "
 #~ "invoice based on sale order after all packing lists have been finished.\n"
 #~ "  - The 'Invoice from the packings' choice is used to create an invoice "
 #~ "during the packing process."
 #~ msgstr ""
 #~ "선적 정책은 인보이스와 배송 오퍼레이션을 동기화하는데 이용됩니다. \n"
-#~ "    - '배송 전 지불'로 선택하면, 인보이스를 먼저 생성하고 난 뒤, 이 인보이스의 결제 뒤에 포장 주문을 생성합니다. \n"
-#~ "    - '선적 및 매뉴얼 인보이스'를 선택하면, 곧 바로 포장 주문을 생성하고, 사용자가 인보이스 초안을 생성하기 위해 '인보이스' "
-#~ "버튼을 클릭할 때를 기다립니다. \n"
-#~ "    - '배송 뒤, 주문에 기초한 인보이스'를 선택하면, 모든 포장 리스트가 완료된 뒤 판매 주문에 기초하여 인보이스 초안을 "
-#~ "생성합니다.  \n"
-#~ "    - '포장으로부터 인보이스'를 선택하면, 포장 프로세스 중에 인보이스를 생성합니다."
+#~ "    - '배송 전 지불'로 선택하면, 인보이스를 먼저 생성하고 난 뒤, 이 인보이"
+#~ "스의 결제 뒤에 포장 주문을 생성합니다. \n"
+#~ "    - '선적 및 매뉴얼 인보이스'를 선택하면, 곧 바로 포장 주문을 생성하고, "
+#~ "사용자가 인보이스 초안을 생성하기 위해 '인보이스' 버튼을 클릭할 때를 기다"
+#~ "립니다. \n"
+#~ "    - '배송 뒤, 주문에 기초한 인보이스'를 선택하면, 모든 포장 리스트가 완"
+#~ "료된 뒤 판매 주문에 기초하여 인보이스 초안을 생성합니다.  \n"
+#~ "    - '포장으로부터 인보이스'를 선택하면, 포장 프로세스 중에 인보이스를 생"
+#~ "성합니다."
 
 #~ msgid "Manual in progress"
 #~ msgstr "진행 중 매뉴얼"
@@ -1348,7 +1379,6 @@ msgstr "판매 주문 라인"
 #~ msgid "In progress"
 #~ msgstr "진행 중"
 
-#, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "판매 주문을 취소하지 못했습니다 !"
 
@@ -1364,31 +1394,28 @@ msgstr "판매 주문 라인"
 #~ msgid ""
 #~ "If you don't have enough stock available to deliver all at once, do you "
 #~ "accept partial shippings or not."
-#~ msgstr "한꺼번에 모두 배송할 충분한 스톡이 없다면, 부분 배송을 할 것인지 아닌 지를 결정."
+#~ msgstr ""
+#~ "한꺼번에 모두 배송할 충분한 스톡이 없다면, 부분 배송을 할 것인지 아닌 지"
+#~ "를 결정."
 
-#, python-format
 #~ msgid "Error"
 #~ msgstr "에러"
 
-#, python-format
 #~ msgid "You must first cancel all packings attached to this sale order."
 #~ msgstr "이 판매 주문에 첨부된 모든 포장들을 먼저 취소하십시오."
 
 #~ msgid "Product UOS"
 #~ msgstr "상품 UOS"
 
-#, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "이 판매 주문을 취소하지 못했습니다 !"
 
-#, python-format
-#~ msgid "You can not cancel a sale order line that has already been invoiced !"
+#~ msgid ""
+#~ "You can not cancel a sale order line that has already been invoiced !"
 #~ msgstr "이미 인보이스가 발행된 판매 주문은 취소할 수 없습니다 !"
 
-#, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "이미 확정된 판매 주문은 삭제할 수 없습니다 !"
 
-#, python-format
 #~ msgid "invalid mode for test_state"
 #~ msgstr "test_state에 유효하지 않은 모드"
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 3f76ba5fa14..9b348b3cd84 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Kiekis"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr ""
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr ""
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -866,8 +851,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,8 +1077,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,44 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 2b315f6c551..5a02c49b74f 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -44,7 +44,7 @@ msgstr "Toewijzing relatie"
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Vervolgstappen om een order uit te leveren."
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Aantal"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr "De factuur is succesvol gemaakt!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Automatische melding"
 
@@ -158,9 +156,7 @@ msgid "Manual Designation"
 msgstr "Handmatig Benoemen"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Opmerkingen"
@@ -171,8 +167,7 @@ msgid "Invoice after delivery"
 msgstr "Factureer na levering"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Belastingen"
 
@@ -232,8 +227,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Verkrijging is aangemaakt na goedkeuring van de verkooporder."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Kostenplaatsen"
 
@@ -322,8 +316,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Factuur gebaseerd op verkooporders."
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Verkooppunt"
 
@@ -338,8 +331,7 @@ msgid "Order N°"
 msgstr "Order nr."
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Orderregels"
 
@@ -349,8 +341,7 @@ msgid "Disc.(%)"
 msgstr "Korting. (%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Factuurregels"
@@ -445,15 +436,13 @@ msgid "Order Reference"
 msgstr "Order referentie"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Gereed"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Prijslijst"
 
@@ -624,8 +613,7 @@ msgid "Taxes :"
 msgstr "Belastingen :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Gefactureerd"
 
@@ -780,8 +768,7 @@ msgid "Direct Delivery"
 msgstr "Rechtstreekse levering"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Waarden"
@@ -814,8 +801,7 @@ msgstr "Bereken"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Verkooppunten"
 
@@ -866,8 +852,7 @@ msgid "Delivery Order Only"
 msgstr "Alleen leveringsopdracht"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Verkooporderregels"
 
@@ -882,8 +867,7 @@ msgid "Sales"
 msgstr "Verkopen"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Hvhd"
 
@@ -898,8 +882,7 @@ msgid "Other data"
 msgstr "Andere data"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Eenheidsprijs"
@@ -925,8 +908,7 @@ msgstr "Factuur"
 #: 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
+#: 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"
@@ -943,8 +925,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Eenheid"
 
@@ -963,9 +944,9 @@ msgstr ""
 "gedaan worden door op de 'Bevestig' button te klikken."
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "In behandeling"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
@@ -1058,8 +1039,7 @@ msgid "Ordering Contact"
 msgstr "Order adres"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1117,8 +1097,7 @@ msgstr ""
 "De naam en adres van de contactpersoon welke de offerte heeft aangevraagd."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Klant"
 
@@ -1130,8 +1109,7 @@ msgstr "Inkoopprijslijst"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Verkooporder"
@@ -1158,8 +1136,7 @@ msgid "Total amount"
 msgstr "Totaalbedrag"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Besteldatum"
 
@@ -1169,9 +1146,9 @@ msgid "Product UoS"
 msgstr "Artikel UoS"
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Handmatig in behandeling"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1247,8 +1224,7 @@ msgstr ""
 "(bijvoorbeeld op regelniveau)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Provincies"
 
@@ -1268,8 +1244,7 @@ msgid "Error: Invalid ean code"
 msgstr "Fout, ongeldige EAN-code"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Verzameld"
 
@@ -1298,3 +1273,243 @@ msgstr "Mijn verkooporders"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Verkooporderregel"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Dashboard voor verkoop"
+
+#. 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"
+msgstr "Verkoop dashboard"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Maandelijkse verkopen"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Verkopers dashboard"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Dossiers van de maand"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mijn open offerte aanvragen"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Dossier-statistieken"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Top-tien verkopen van de maand"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Gemiddelde prijs"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Overzicht aangemaakte verkoopopdrachten"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Verkoopopdrachten per categorie"
+
+#. 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"
+msgstr "Maandelijkse cumulatieve verkoop over een jaar"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Verkoopopdrachten per product"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Maandelijkse verkoop-omzet over één jaar"
+
+#. 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"
+msgstr "Omzet per product"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Alle maanden"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Verkoopopdrachten per categorie"
+
+#. 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"
+msgstr "Verkoop van de maand"
+
+#. 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)"
+msgstr "Verkoop per product (deze maand)"
+
+#. 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"
+msgstr "Maandelijkse verkoopomzet gedurende één jaar"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Verkoopbeheer - Overzichten"
+
+#. 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"
+msgstr "Verkoop per productcategorie"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Maandelijkse cumulatieve verkoop-omzet over één jaar"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# Producten"
+
+#. 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"
+msgstr "Verkoop per product"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Deze maand"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categorieën"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Gemaakte verkoopopdrachten"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Overzichten"
+
+#. 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"
+msgstr "Omzet per maand"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Dagelijkse verkoop-omzet over één jaar"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Diagrammen"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Handmatig in bewerking"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Totale omzet"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "In behandeling"
+
+#. 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)"
+msgstr "Verkoop per productcategorie (deze maand)"
+
+#. 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"
+msgstr "Dagelijkse verkoop-omzet over één jaar"
+
+#. 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"
+msgstr "Maand"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# Regels"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Aanmaakdatum"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Aangemaakte verkoopopdrachten"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Verkopen per status"
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index 3646ed58f49..25d64cd9821 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -52,7 +52,9 @@ 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?"
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
 msgstr ""
 
 #. module: sale
@@ -66,8 +68,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr ""
 
@@ -77,8 +78,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -100,7 +100,8 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this invoice"
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
 msgstr ""
 
 #. module: sale
@@ -130,7 +131,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid "Whenever confirm button is clicked, the draft state is moved to manual. that is, quotation is moved to  sale order."
+msgid ""
+"Whenever confirm button is clicked, the draft state is moved to manual. that "
+"is, quotation is moved to  sale order."
 msgstr ""
 
 #. module: sale
@@ -150,9 +153,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr ""
@@ -163,8 +164,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr ""
 
@@ -179,8 +179,7 @@ msgid "Shipping Policy"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -225,8 +224,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -268,7 +266,11 @@ 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."
+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."
 msgstr ""
 
 #. module: sale
@@ -308,8 +310,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -324,8 +325,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -335,8 +335,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -353,7 +352,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
-msgid "Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list."
+msgid ""
+"Packing list is created when 'Assign' is being clicked after confirming the "
+"sale order. This transaction moves the sale order to packing list."
 msgstr ""
 
 #. module: sale
@@ -369,7 +370,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery."
+msgid ""
+"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+"will automatic create after delivery."
 msgstr ""
 
 #. module: sale
@@ -425,15 +428,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -591,7 +592,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid "In sale order , procuerement for each line and it comes into the procurement order"
+msgid ""
+"In sale order , procuerement for each line and it comes into the procurement "
+"order"
 msgstr ""
 
 #. module: sale
@@ -600,8 +603,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -623,7 +625,9 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
-msgid "This Configuration step use to set default picking policy when make sale order"
+msgid ""
+"This Configuration step use to set default picking policy when make sale "
+"order"
 msgstr ""
 
 #. module: sale
@@ -641,7 +645,8 @@ msgstr ""
 
 #. module: sale
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 
 #. module: sale
@@ -749,8 +754,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -768,7 +772,9 @@ 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."
+msgid ""
+"Invoice is created when 'Create Invoice' is being clicked after confirming "
+"the sale order. This transaction moves the sale order to invoices."
 msgstr ""
 
 #. module: sale
@@ -778,8 +784,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -806,11 +811,17 @@ 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."
+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."
 msgstr ""
 
 #. module: sale
@@ -824,8 +835,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -840,8 +850,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -856,8 +865,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -883,8 +891,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -892,12 +899,16 @@ 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'."
+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'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -908,7 +919,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
-msgid "Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button."
+msgid ""
+"Confirming the packing list moves them to delivery order. This can be done "
+"by clicking on 'Validate' button."
 msgstr ""
 
 #. module: sale
@@ -923,8 +936,10 @@ msgstr ""
 
 #. module: sale
 #: constraint:ir.model:0
-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 !"
+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 !"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1005,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1058,12 +1072,12 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
-msgid "The name and address of the contact that requested the order or quotation."
+msgid ""
+"The name and address of the contact that requested the order or quotation."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1075,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1103,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1125,7 +1137,11 @@ 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."
+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."
 msgstr ""
 
 #. module: sale
@@ -1175,12 +1191,14 @@ msgstr ""
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
-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)."
+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)."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1200,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1231,3 +1248,242 @@ msgstr ""
 msgid "Sale Order line"
 msgstr ""
 
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 07e392686d8..9e51895277e 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Kroki dostawy zamówienia sprzedaży"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Ilość"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Twoja faktura została poprawnie utworzona"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Deklaracja automatyczna"
 
@@ -161,9 +159,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notatki"
@@ -174,8 +170,7 @@ msgid "Invoice after delivery"
 msgstr "Faktura po dostawie"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Podatki"
 
@@ -235,8 +230,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Nabycie jest tworzone po potwierdzeniu zamówienia sprzedaży"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Konto analityczne"
 
@@ -326,8 +320,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Faktura wg zamówień sprzedaży"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Sklep sprzedaży"
 
@@ -342,8 +335,7 @@ msgid "Order N°"
 msgstr "Nr zamówienia"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Pozycje zamówienia"
 
@@ -353,8 +345,7 @@ msgid "Disc.(%)"
 msgstr "Up.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Pozycje faktury"
@@ -452,15 +443,13 @@ msgid "Order Reference"
 msgstr "Numer"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Wykonano"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cennik"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Podatki :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Zafakturowano"
 
@@ -785,8 +773,7 @@ msgid "Direct Delivery"
 msgstr "Dostawa bezpośrednia"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Właściwości"
@@ -819,8 +806,7 @@ msgstr "Oblicz"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Sklep"
 
@@ -881,8 +867,7 @@ msgid "Delivery Order Only"
 msgstr "Tylko zamówienia dostawy"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Pozycje zamówienia sprzedaży"
 
@@ -897,8 +882,7 @@ msgid "Sales"
 msgstr "Sprzedaż"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Il."
 
@@ -913,8 +897,7 @@ msgid "Other data"
 msgstr "Inne dane"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena jednostkowa"
@@ -940,8 +923,7 @@ msgstr "Faktura"
 #: 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
+#: 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"
@@ -963,8 +945,7 @@ msgstr ""
 "ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "JM"
 
@@ -1079,8 +1060,7 @@ msgid "Ordering Contact"
 msgstr "Kontakt do zamawiającego"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -1137,8 +1117,7 @@ msgid ""
 msgstr "Nazwa i adres kontaktu proszącego o ofertę."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
@@ -1150,8 +1129,7 @@ msgstr "Cennik zakupu"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Zamówienie sprzedaży"
@@ -1178,8 +1156,7 @@ msgid "Total amount"
 msgstr "Suma kwot"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data zamówienia"
 
@@ -1189,9 +1166,9 @@ msgid "Product UoS"
 msgstr "JS produktu"
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Recznie w trakcie przetwarzania"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1268,8 +1245,7 @@ msgstr ""
 "oddzielnie)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Stany"
 
@@ -1289,8 +1265,7 @@ msgid "Error: Invalid ean code"
 msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Wydano"
 
@@ -1319,3 +1294,243 @@ msgstr "Moje zamówienia sprzedaży"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Pozycja zamówienia sprzedaży"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Konsola dla sprzedaży"
+
+#. 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"
+msgstr "Konsola sprzedaży"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Sprzedaż w miesiącu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Konsola szefa sprzedaży"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Sprawy miesiąca"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Moje otwarte zamówienia"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Statystyka spraw"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Najlepsze sprzedaże w miesiącu"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Cena przeciętna"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Raport z utworzonych zamówień sprzedaży"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Zamówienia sprzedaży wg kategorii"
+
+#. 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"
+msgstr "Miesięczny skumulowany obrót w jednym roku"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Zamówienia sprzedaży wg produktów"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Miesięczny obrót w jednym roku"
+
+#. 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"
+msgstr "Obrót na produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Wszystkie miesiące"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Pełna cena"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Zamówienia sprzedaży wg kategorii"
+
+#. 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"
+msgstr "Sprzedaż w miesiącu"
+
+#. 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)"
+msgstr "Sprzedaż wg produktu (w tym miesiącu)"
+
+#. 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"
+msgstr "Miesięczny obrót w ciągu roku"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Sprzedaż - Raportowanie"
+
+#. 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"
+msgstr "Sprzedaż wg kategorii produktów"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Miesięczny skumulowany obrót w ciągu jednego roku"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "# Produktów"
+
+#. 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"
+msgstr "Sprzedaż wg produktów"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "W tym miesiącu"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategorie"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Utworzone zamówienia sprzedaży"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Raportowanie"
+
+#. 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"
+msgstr "Obrót miesięczny"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Dzienny obrót na rok"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Wykresy"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Ręczne w trakcie przetwarzania"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Suma obrotów"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "W trakcie przetwarzania"
+
+#. 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)"
+msgstr "Sprzedaż wg kategorii poroduktów (w tym miesiącu)"
+
+#. 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"
+msgstr "Dizenny obrót na rok"
+
+#. 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"
+msgstr "Miesiąc"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# pozycji"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Utworzone zamówienia sprzedaży"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Sprzedaż wg stanu"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 9cdd95710e4..a0a3ff75759 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Etapas para entregar uma ordem de venda"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "A sua factura foi criada com êxito"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Declaração Automática"
 
@@ -160,9 +158,7 @@ msgid "Manual Designation"
 msgstr "Designação manual"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -173,8 +169,7 @@ msgid "Invoice after delivery"
 msgstr "Facturar após a entrega"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impostos"
 
@@ -234,8 +229,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "O aprovisionamento é criado depois de confirmar a ordem da venda"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Conta da contabilidade analítica"
 
@@ -326,8 +320,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Factura baseada nas ordens de venda"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Loja de venda"
 
@@ -342,8 +335,7 @@ msgid "Order N°"
 msgstr "Ordem Nº"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Lindas do pedido"
 
@@ -353,8 +345,7 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Linhas da Factura"
@@ -452,15 +443,13 @@ msgid "Order Reference"
 msgstr "Referência do Pedido"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Concluído"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de preços"
 
@@ -631,8 +620,7 @@ msgid "Taxes :"
 msgstr "Impostos"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -786,8 +774,7 @@ msgid "Direct Delivery"
 msgstr "Entrega directa"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Propriedades"
@@ -819,8 +806,7 @@ msgstr "Calcular"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Loja"
 
@@ -871,8 +857,7 @@ msgid "Delivery Order Only"
 msgstr "Ordem de expedição apenas"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Linhas da ordem de venda"
 
@@ -887,8 +872,7 @@ msgid "Sales"
 msgstr "Vendas"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Qt"
 
@@ -903,8 +887,7 @@ msgid "Other data"
 msgstr "Outros dados"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Preço Unitário"
@@ -930,8 +913,7 @@ msgstr "Factura"
 #: 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
+#: 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"
@@ -948,8 +930,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "UdM"
 
@@ -1061,8 +1042,7 @@ msgid "Ordering Contact"
 msgstr "Contacto do pedido"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -1116,12 +1096,10 @@ msgstr "Criar Facturas"
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact that requested the order or quotation."
-msgstr ""
-"O nome e o endereço do contacto que fez o pedido ou requereu a cotação"
+msgstr "O nome e o endereço do contacto que fez o pedido ou requereu a cotação"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
@@ -1133,8 +1111,7 @@ msgstr "Lista de Preços de Compras"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Ordem de Venda"
@@ -1161,8 +1138,7 @@ msgid "Total amount"
 msgstr "Montante Total"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Data do pedido"
 
@@ -1247,8 +1223,7 @@ msgstr ""
 "linha)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Estados"
 
@@ -1268,8 +1243,7 @@ msgid "Error: Invalid ean code"
 msgstr "Erro: Código ean inválido"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Escolhido"
 
@@ -1298,3 +1272,243 @@ msgstr "Minhas Ordens de Venda"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Linha da Ordem de Venda"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "Painel de vendas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Vendas do mês"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Painel gestor de vendas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Minhas cotações abertas"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estatistica dos processos"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Dez maiores vendas do mês"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Preço Médio"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Ordens de venda por categoria"
+
+#. 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"
+msgstr "Volume de vendas mensais acumuladas ao longo de um ano"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Ordens de venda por produtos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Volume de vendas mensais ao longo de um ano"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Todos os meses"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Ordens de venda por categorias"
+
+#. 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"
+msgstr "Vendas do mês"
+
+#. 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)"
+msgstr "Vendas por produto (mês actual)"
+
+#. 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"
+msgstr "Volume de vendas mensais ao longo de um ano"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr "Vendas por categorias e produtos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "Volume de vendas mensais acumuladas ao longo de um ano"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Nº de produtos"
+
+#. 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"
+msgstr "Vendas por produtos"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Este mês"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Relatório"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "Volume de vendas diárias ao longo de um ano"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Gráficos"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manual em curso"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "Em curso"
+
+#. 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)"
+msgstr "Vendas por categoria de produtos (mês actual)"
+
+#. 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"
+msgstr "Volume de vendas diárias ao longo de um ano"
+
+#. 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"
+msgstr "Mês"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "# de Linhas"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index dcedaffc545..2edc6b22dc9 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # translation of pt_BR.po to
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -9,8 +9,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-12-09 13:04+0000\n"
-"Last-Translator: Renato Lima - http://www.akretion.com "
-"<renatonlima@gmail.com>\n"
+"Last-Translator: Renato Lima - http://www.akretion.com <renatonlima@gmail."
+"com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,8 +73,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Passos para Entregar uma Ordem de Venda"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -84,8 +83,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Sua fatura foi criada com sucesso !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Declaração Automática"
 
@@ -160,9 +158,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notas"
@@ -173,8 +169,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impostos"
 
@@ -219,9 +214,9 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:report.sale.order.created:0
 msgid "Reference"
-msgstr ""
+msgstr "Referência"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -234,8 +229,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Projeto"
 
@@ -321,8 +315,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -337,8 +330,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Linhas de Pedido"
 
@@ -348,8 +340,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -437,20 +428,18 @@ msgid "Confirm Order"
 msgstr "Confirmar Pedido"
 
 #. module: sale
-#: field:sale.order,name:0
+#: field:report.sale.order.created,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Ordem de Referência"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de Preços"
 
@@ -623,8 +612,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -776,8 +764,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -807,8 +794,7 @@ msgstr "Computar"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -859,8 +845,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -870,13 +855,12 @@ msgid "Sequence"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "Vendas"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -891,8 +875,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -918,8 +901,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -936,8 +918,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -954,9 +935,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em Andamento"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
@@ -1050,8 +1031,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1108,10 +1088,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:report.sale.order.created,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
@@ -1121,8 +1100,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1149,8 +1127,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1232,8 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1253,8 +1229,7 @@ msgid "Error: Invalid ean code"
 msgstr "Error: código EAN invalido"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1283,3 +1258,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Relatório de Ordem de Venda Criada"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr "Retorno por Produto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Todos os meses"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Este mes"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Relatórios"
+
+#. 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"
+msgstr "Retorno por Mês"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Retorno Total"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Data de Criação"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Odem de Vendas Criadas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index cdf7ffb3ba3..c74706f4fce 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr ""
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Note"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Taxe"
 
@@ -215,9 +210,9 @@ msgid "Outgoing Products"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
+#: view:report.sale.order.created:0
 msgid "Reference"
-msgstr ""
+msgstr "Referinta"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Proiect"
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Linii Comanda"
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -433,20 +424,18 @@ msgid "Confirm Order"
 msgstr "Confirma comanda"
 
 #. module: sale
-#: field:sale.order,name:0
+#: field:report.sale.order.created,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referinţă comandă"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarif"
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ msgstr "Calculeaza"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -861,13 +846,12 @@ msgid "Sequence"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "Vinzari"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -945,9 +926,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "In progres"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,10 +1077,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:report.sale.order.created,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,10 +1116,9 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: field:report.sale.order.created,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Data comenzii"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
@@ -1149,9 +1126,9 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Manual - în progres"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "Raport de comenzi create"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr "Venitul pe produs"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Comenzi create"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr "Venitul lunar"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Venitul total"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Data Creării"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Comenzi create"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index e45ae4b49d3..b8469370dca 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -44,12 +44,14 @@ msgstr "Долевой участник"
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.created,state:0
+#: selection:report.sale.order.product,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "В ожидании расписания"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -71,8 +73,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Шаги для получения Порядка продажи"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Количество"
 
@@ -82,8 +83,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -99,9 +99,11 @@ msgid "Set to Draft"
 msgstr "Установить в 'Черновик'"
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.created,state:0
+#: selection:report.sale.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Исключительная ситуация счета"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -158,9 +160,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Примечания"
@@ -171,8 +171,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Налоги"
 
@@ -192,9 +191,11 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.created,state:0
+#: selection:report.sale.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Исключительная ситуация поставки"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -232,8 +233,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Счет аналитики"
 
@@ -319,8 +319,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -335,8 +334,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Позиции заказа"
 
@@ -346,8 +344,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Позиции счета"
@@ -440,15 +437,13 @@ msgid "Order Reference"
 msgstr "Ссылка на заказ"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Выполнено"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Каталог"
 
@@ -617,8 +612,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Выставлен счет"
 
@@ -769,8 +763,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Свойства"
@@ -800,8 +793,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Магазин"
 
@@ -852,8 +844,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Позиции заказа"
 
@@ -868,8 +859,7 @@ msgid "Sales"
 msgstr "Продажи"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Кол-во"
 
@@ -884,8 +874,7 @@ msgid "Other data"
 msgstr "Прочие данные"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Цена за ед."
@@ -911,8 +900,7 @@ msgstr "Счет"
 #: 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
+#: 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"
@@ -929,8 +917,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Ед. изм."
 
@@ -1043,8 +1030,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Описание"
 
@@ -1102,8 +1088,7 @@ msgstr ""
 "Имя и адрес контакта, разместившего заказ или запросившего предолжение."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Клиент"
 
@@ -1115,8 +1100,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Заказ"
@@ -1143,8 +1127,7 @@ msgid "Total amount"
 msgstr "Итоговая сумма"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Дата заказа"
 
@@ -1229,8 +1212,7 @@ msgstr ""
 "позициям)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Cостояния"
 
@@ -1250,8 +1232,7 @@ msgid "Error: Invalid ean code"
 msgstr "Ошибка: Неправильный штрих-код"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1280,3 +1261,243 @@ msgstr "Мой заказ"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Позиция заказа"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "Панель аналитики продаж"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Продажи месяца"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Панель менеджера продаж"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Случаи месяца"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Мои незакрытые предложения"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Статистика случаев"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "10 лучших продаж месяца"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Средняя цена"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Клиентские заказы по продукции"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Все месяцы"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Итоговая цена"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr "Продажи по категриям продукции"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr "Продажи по продуктам"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Данный месяц"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Категории"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Графики"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Выполняется вручную"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr "Месяц"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Кол-во позиций"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 8737a423875..f26b2a7cdbc 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1230,4 +1230,242 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index a65287a1ca2..1800c50d147 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -44,7 +44,7 @@ msgstr "Področni partner"
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Samodejna napoved"
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr "Ročno označevanje"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Opombe"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Davki"
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analitični konto"
 
@@ -322,8 +316,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Trgovina"
 
@@ -338,8 +331,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Postavke naročila"
 
@@ -349,8 +341,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Postavke računa"
@@ -443,15 +434,13 @@ msgid "Order Reference"
 msgstr "Sklic naloga"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Opravljeno"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cenik"
 
@@ -620,8 +609,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Zaračunano"
 
@@ -772,8 +760,7 @@ msgid "Direct Delivery"
 msgstr "Direktna dostava"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Karakteristike"
@@ -803,8 +790,7 @@ msgstr "Izračunaj"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -855,8 +841,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Postavke prodajnega naloga"
 
@@ -871,8 +856,7 @@ msgid "Sales"
 msgstr "Prodaja"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Kol."
 
@@ -887,8 +871,7 @@ msgid "Other data"
 msgstr "Ostali podatki"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Cena enote"
@@ -914,8 +897,7 @@ msgstr "Račun"
 #: 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
+#: 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"
@@ -932,8 +914,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "ME"
 
@@ -950,9 +931,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "V obdelavi"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
@@ -1045,8 +1026,7 @@ msgid "Ordering Contact"
 msgstr "Stik za naročilo"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Opis"
 
@@ -1103,8 +1083,7 @@ msgid ""
 msgstr "Naziv in naslov stika, ki je zahteval naročilo ali ponudbo."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kupec"
 
@@ -1116,8 +1095,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Prodajni nalog"
@@ -1144,8 +1122,7 @@ msgid "Total amount"
 msgstr "Skupni znesek"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Datum naročila"
 
@@ -1229,8 +1206,7 @@ msgstr ""
 "prodajni nalog je lahko večkrat zaračunan (n.pr. po postavkah)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Stanja"
 
@@ -1250,8 +1226,7 @@ msgid "Error: Invalid ean code"
 msgstr "Napaka: neveljavna EAN črtna koda"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Prevzeto"
 
@@ -1280,3 +1255,243 @@ msgstr "Moji prodajni nalogi"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Postavka prodajnega naloga"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Nadzorna plošča za prodaje"
+
+#. 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"
+msgstr "Nadzorna plošča za prodajo"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Mesečna prodaja"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Plošča za direktorja prodaje"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Primeri v meseci"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Moje odprte ponudbe"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Statistika primerov"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Naj deset prodaj meseca"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Povprečna cena"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Naročila po kategorijah"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Naročila po proizvodih"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Vsi meseci"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Skupna cena"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+msgstr "Mesečna prodaja"
+
+#. 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)"
+msgstr "Prodaja po proizvodih (ta mesec)"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Število proizvodov"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Poročanje"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Grafikoni"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Ročno v teku"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "V teku"
+
+#. 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)"
+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"
+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"
+msgstr "Mesec"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Število vrstic"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Datum izdelave"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 1aebb66a765..e32e7e98dcc 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -70,8 +70,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Steg för att leverera en kundorder"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Antal"
 
@@ -81,8 +80,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Fakturan har skapats!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -157,9 +155,7 @@ msgid "Manual Designation"
 msgstr "Manuell påskrift"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Anteckningar"
@@ -170,8 +166,7 @@ msgid "Invoice after delivery"
 msgstr "Fakturera efter leverans"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Moms"
 
@@ -231,8 +226,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Anskaffning skapas när kundordern godkönts"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Objekt"
 
@@ -322,8 +316,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Fakturera utgående från kundorder"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -338,8 +331,7 @@ msgid "Order N°"
 msgstr "Ordernummer"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Kundorderrader"
 
@@ -349,8 +341,7 @@ msgid "Disc.(%)"
 msgstr "Rab.(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Fakturarader"
@@ -446,15 +437,13 @@ msgid "Order Reference"
 msgstr "Orderreferens"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Klar"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Prislista"
 
@@ -623,8 +612,7 @@ msgid "Taxes :"
 msgstr "Moms :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Fakturerad"
 
@@ -777,8 +765,7 @@ msgid "Direct Delivery"
 msgstr "Direktleverans"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Egenskaper"
@@ -810,8 +797,7 @@ msgstr "Beräkna"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Försäljningställe"
 
@@ -862,8 +848,7 @@ msgid "Delivery Order Only"
 msgstr "Endast leveransorder"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Kundorderrader"
 
@@ -878,8 +863,7 @@ msgid "Sales"
 msgstr "Kundorder"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Antal"
 
@@ -894,8 +878,7 @@ msgid "Other data"
 msgstr "Övrig data"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Pris"
@@ -921,8 +904,7 @@ msgstr "Faktura"
 #: 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
+#: 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"
@@ -943,8 +925,7 @@ msgstr ""
 "schemalagda körningen för aktuellt datum."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Enhet"
 
@@ -1056,8 +1037,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1115,8 +1095,7 @@ msgstr ""
 "Namn och adress för den kontakt som beställt en kundorder eller offert."
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kund"
 
@@ -1128,8 +1107,7 @@ msgstr "Inköpsprislista"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Kundorder"
@@ -1156,8 +1134,7 @@ msgid "Total amount"
 msgstr "Totalt belopp"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Orderdatum"
 
@@ -1241,8 +1218,7 @@ msgstr ""
 "fakturerats flera gånger (t ex per rad)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Stater"
 
@@ -1262,8 +1238,7 @@ msgid "Error: Invalid ean code"
 msgstr "Fel: felaktig ean kod"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Plockad"
 
@@ -1292,3 +1267,243 @@ msgstr "Mina kundorder"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Kundorderrad"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Dashboard för kundorder"
+
+#. 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"
+msgstr "Kundorder dashboard"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Försäljning denna månad"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Dashboard för försäljningschef"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Ärenden denna månad"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mina öppna offerter"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Ärendestatistik"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Top tio kundorder denna månad"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Snittpris"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Kundorder per kategori"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Kundorder per produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr "Månatlig omsättning  för ett år"
+
+#. 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"
+msgstr "Omsättning per produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Alla månader"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Totalt belopp"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Kundorder per kategorier"
+
+#. 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"
+msgstr "Försäljning för månaden"
+
+#. 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)"
+msgstr "Försäljning per produkt (denna månad)"
+
+#. 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"
+msgstr "Månatlig omsättning för ett år"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Kunderorder - rapporter"
+
+#. 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"
+msgstr "Försäljning per produktkategori"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "st produkter"
+
+#. 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"
+msgstr "Försäljning per produkt"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Denna månad"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategorier"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "Skapade kundorder"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Rapportering"
+
+#. 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"
+msgstr "Omsättning per månad"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Diagram"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "Total omsättning"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "Pågående"
+
+#. 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)"
+msgstr "Försäljning per produktkategori (denna månad)"
+
+#. 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"
+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"
+msgstr "Månad"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "rader"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Skapad datum"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Skapade kundorder"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "Försäljning per stat"
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 3e9af6cb7ec..f319d6f0116 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr ""
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr ""
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr ""
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr ""
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr ""
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -866,8 +851,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,8 +1077,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index ab31f0b2831..7daa311ef95 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -71,8 +71,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Satış Emri Teslimat Adımları"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Adet"
 
@@ -82,8 +81,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Fatura başarıyla oluşturuldu !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Otomatik Bildiri"
 
@@ -158,9 +156,7 @@ msgid "Manual Designation"
 msgstr "Elle Adlandırma"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Notlar"
@@ -171,8 +167,7 @@ msgid "Invoice after delivery"
 msgstr "Teslimat Sonrası Fatura Çıkar"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Vergiler"
 
@@ -232,8 +227,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Satış emrinin doğrulanmasından sonra satınalma oluşturulur."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Analitik Hesap"
 
@@ -319,8 +313,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Satış Siparişleri Bağlı Fatura"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Satış Mağazası"
 
@@ -335,8 +328,7 @@ msgid "Order N°"
 msgstr "Sipariş N°"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Sipariş Satırları"
 
@@ -346,8 +338,7 @@ msgid "Disc.(%)"
 msgstr "isk. %"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Fatura Kalemleri"
@@ -440,15 +431,13 @@ msgid "Order Reference"
 msgstr "Sipariş Referansı"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Bitti"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Fiyat Listesi"
 
@@ -617,8 +606,7 @@ msgid "Taxes :"
 msgstr "Vergi :"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Faturalandı"
 
@@ -769,8 +757,7 @@ msgid "Direct Delivery"
 msgstr "Direk Teslimat"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Özellikler"
@@ -800,8 +787,7 @@ msgstr "Hesapla"
 
 #. 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "İş Yeri"
 
@@ -852,8 +838,7 @@ msgid "Delivery Order Only"
 msgstr "Sadece Teslimat Siparişi"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Satış Sipariş Kalemleri"
 
@@ -868,8 +853,7 @@ msgid "Sales"
 msgstr "Satışlar"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "Mik."
 
@@ -884,8 +868,7 @@ msgid "Other data"
 msgstr "Diğer Bilgiler"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Birim Fiyat"
@@ -911,8 +894,7 @@ msgstr "Fatura"
 #: 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
+#: 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"
@@ -929,8 +911,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "Birim"
 
@@ -960,7 +941,7 @@ msgstr "Ön Ödeme (Avans-Peşinat)"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1041,8 +1022,7 @@ msgid "Ordering Contact"
 msgstr "Sipariş Adresi"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1099,8 +1079,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Müşteri"
 
@@ -1112,8 +1091,7 @@ msgstr "Alış Fiyat Listeleri"
 #. 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Satış Siparişi"
@@ -1140,8 +1118,7 @@ msgid "Total amount"
 msgstr "Toplam Tutar"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Sipariş Tarihi"
 
@@ -1223,8 +1200,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Durumlar"
 
@@ -1244,8 +1220,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Toplanma"
 
@@ -1274,3 +1249,243 @@ msgstr "Satış Siparişlerim (Bana Ait)"
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr "Satış Sipariş Kalemi"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "Satış Paneli"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Aylık Satışlar"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Satış Yönetici Panosu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Servis Talebi İstatistikleri"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "Ayın En 10 Satışları"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "Ortalama Fiyat"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr "Kategorilere göre siparişler"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "Ürünlere göre siparişler"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Tüm aylar"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "Toplam Fiyat"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr "Kategorilere göre satışlar"
+
+#. 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"
+msgstr "Aylık satışlar"
+
+#. 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)"
+msgstr "Ürüne göre satışlar (bu ay)"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Satış Yönetimi - Raporlama"
+
+#. 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"
+msgstr "Ürün Kategorilerine Göre Satışlar"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr "Ürün adedi"
+
+#. 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"
+msgstr "Ürünlere Göre Satışlar"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Bu Ay"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "Kategoriler"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr "Raporlama"
+
+#. 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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "Grafikler"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "Manuel İşlem Devam Ediyor"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr "İşlenen"
+
+#. 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)"
+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"
+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"
+msgstr "Ay"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "Satır sayısı"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "Oluşturulma Tarihi"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "Oluşan Satış Siparişleri"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 473eaa3a345..eb085bcef1c 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "Стадії Доставки Замовлення на Продаж"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "Кількість"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr "Ваш Інвойс успішно створено !"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "Автоматичнй опис"
 
@@ -158,9 +156,7 @@ msgid "Manual Designation"
 msgstr "Ручне позначення"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "Примітки"
@@ -171,8 +167,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Податки"
 
@@ -232,8 +227,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "Забезпечення створюється після підтвердження замовлення на продаж."
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "Аналітичний рахунок"
 
@@ -324,8 +318,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "Відділ продажу"
 
@@ -340,8 +333,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "Рядки заявки"
 
@@ -351,8 +343,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Рядки інвойса"
@@ -445,15 +436,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "Виконано"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "Прейскурант"
 
@@ -622,8 +611,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Заінвойсовано"
 
@@ -774,8 +762,7 @@ msgid "Direct Delivery"
 msgstr "Пряма Доставка"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Властивості"
@@ -805,8 +792,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "Торгова точка"
 
@@ -857,8 +843,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "Рядки Замовлення на продаж"
 
@@ -873,8 +858,7 @@ msgid "Sales"
 msgstr "Продажі"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "К-сть"
 
@@ -889,8 +873,7 @@ msgid "Other data"
 msgstr "Інші дані"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Ціна за од."
@@ -916,8 +899,7 @@ msgstr "Інвойс"
 #: 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
+#: 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"
@@ -934,8 +916,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "ОВ"
 
@@ -1047,8 +1028,7 @@ msgid "Ordering Contact"
 msgstr "Контакти замовника"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "Опис"
 
@@ -1105,8 +1085,7 @@ msgid ""
 msgstr "Назва та адреса контакту, які вимагає заявка чи пропозиція"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Клієнт"
 
@@ -1118,8 +1097,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "Заявка на продаж"
@@ -1146,8 +1124,7 @@ msgid "Total amount"
 msgstr "Загальна сума"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "Дата заявки"
 
@@ -1231,8 +1208,7 @@ msgstr ""
 "можуть бути оформлені інвойси декілька разів (наприклад, на рядок)."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "Стани"
 
@@ -1252,8 +1228,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "Відвантажено"
 
@@ -1283,7 +1258,246 @@ msgstr "Моя заявка на продаж"
 msgid "Sale Order line"
 msgstr "Рядок заявки на продаж"
 
-#, python-format
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "Всі місяці"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "Цей місяць"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
+
 #~ msgid "Invalid action !"
 #~ msgstr "Невірна дія !"
 
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 87ed37fb4c8..e4fdb824ced 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr "步骤提供销售订单"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr "数量"
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr "你的发票已经成功创建!"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr "一般信息"
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr "手动指定"
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "备注"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr "送货后开发票"
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "税款"
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr "确认销售订单后创建产品需求"
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "辅助核算项目"
 
@@ -279,8 +273,9 @@ msgid ""
 "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."
 msgstr ""
-"销售订单将自动创建发票(发票草稿).订单和送货数量可能不相同.如果你的发票基于已订购或送货数量你必须选择你必须选择.如果产品是一个服务运送数量以任务花费的"
-"小时数计算."
+"销售订单将自动创建发票(发票草稿).订单和送货数量可能不相同.如果你的发票基于已"
+"订购或送货数量你必须选择你必须选择.如果产品是一个服务运送数量以任务花费的小时"
+"数计算."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -319,8 +314,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr "发票基于销售订单"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr "销售商店"
 
@@ -335,8 +329,7 @@ msgid "Order N°"
 msgstr "订单号"
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "订单明细"
 
@@ -346,8 +339,7 @@ msgid "Disc.(%)"
 msgstr "折扣(%)"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "发票行"
@@ -440,15 +432,13 @@ msgid "Order Reference"
 msgstr "订单参考"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr "完成"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "价格表"
 
@@ -617,8 +607,7 @@ msgid "Taxes :"
 msgstr "税:"
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "已开发票"
 
@@ -769,8 +758,7 @@ msgid "Direct Delivery"
 msgstr "直接送货"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "属性"
@@ -800,8 +788,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr "商店"
 
@@ -857,8 +844,7 @@ msgid "Delivery Order Only"
 msgstr "只有送货单"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr "销售订单明细"
 
@@ -873,8 +859,7 @@ msgid "Sales"
 msgstr "销售"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr "数量"
 
@@ -889,8 +874,7 @@ msgid "Other data"
 msgstr "其它数据"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "单价"
@@ -916,8 +900,7 @@ msgstr "发票"
 #: 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
+#: 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"
@@ -932,12 +915,12 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
-"给出这报价单或销售订单的状态这异常状态是在发票确认(发票异常)或在包装单处理(送货异常)自动设定时取消操作发生的.这\"等待调度表\"状态是在发票已确认但"
-"在等待在\"日期排序\"内运行调度."
+"给出这报价单或销售订单的状态这异常状态是在发票确认(发票异常)或在包装单处理(送"
+"货异常)自动设定时取消操作发生的.这\"等待调度表\"状态是在发票已确认但在等待在"
+"\"日期排序\"内运行调度."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr "计量单位"
 
@@ -1048,8 +1031,7 @@ msgid "Ordering Contact"
 msgstr "订购联系"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr "说明"
 
@@ -1106,8 +1088,7 @@ msgid ""
 msgstr "联系订单或报价单的请求者名称和地址"
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "客户"
 
@@ -1119,8 +1100,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr "销售订单"
@@ -1147,8 +1127,7 @@ msgid "Total amount"
 msgstr "金额合计"
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr "订购日期"
 
@@ -1174,7 +1153,9 @@ msgid ""
 "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."
-msgstr "默认情况下系统能管理复杂的路线和从你的仓库到业务伙伴库位的路径.这将设置最常见和最简单的方法把产品交付给客户通过一、两个操作."
+msgstr ""
+"默认情况下系统能管理复杂的路线和从你的仓库到业务伙伴库位的路径.这将设置最常见"
+"和最简单的方法把产品交付给客户通过一、两个操作."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
@@ -1230,8 +1211,7 @@ msgid ""
 msgstr "这是发票列表已经产生销售订单.上述销售订单可能已经开发票."
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr "状态"
 
@@ -1251,8 +1231,7 @@ msgid "Error: Invalid ean code"
 msgstr "错误:无效EAN编码"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr "已领料/退货"
 
@@ -1282,6 +1261,246 @@ msgstr "我的销售订单"
 msgid "Sale Order line"
 msgstr "销售订单明细"
 
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr "销售控制台"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "当月销售"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "销售管理面板"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "这月业务个案"
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "我打开报价"
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "业务个案统计"
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "当月销售"
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr "平均价"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr "创建销售订单报表"
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr "一年内月累积营业额"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr "销售订单产品"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr "每产品的营业额"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr "所有月份"
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr "价格合计"
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr "一年内月累积营业额"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr "销售的产品分类"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr "一年内月累积营业额"
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr "销售的产品"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr "本月"
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr "分类"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr "创建销售订单"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr "每月的营业额"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr "一年内每天的营业额"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr "图表"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr "手动处理"
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr "总营业额"
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr "月"
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr "明细#"
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr "创建日期"
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr "创建销售订单"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr "销售的状态"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -1316,3 +1535,46 @@ msgstr "销售订单明细"
 #~ "\t\t- 多业务伙伴一起\n"
 #~ "\t\t- 送货成本\n"
 #~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for salesman that includes:\n"
+#~ "    * You open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现业务员控制台包括:\n"
+#~ "    *你待处理的报价\n"
+#~ "    *这月前10业务员\n"
+#~ "    *业务统计\n"
+#~ "    *销售产品图表\n"
+#~ "    *月份业务图表\n"
+#~ "    "
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the sale module:\n"
+#~ "    * Sales order by product (my/this month/all)\n"
+#~ "    * Sales order by category of product (my/this month/all)\n"
+#~ "\n"
+#~ "    Some predefined lists:\n"
+#~ "    * Sales of the month\n"
+#~ "    * Open quotations\n"
+#~ "    * Uninvoiced Sales\n"
+#~ "    * Uninvoiced but shipped Sales\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    销售报表模块:\n"
+#~ "\t- 销售订单产品(我的、这月、所有)\n"
+#~ "\t- 销售订单的产品分来(我的、这月、所有)\n"
+#~ "\t\n"
+#~ "\t\t一些预定清单:\n"
+#~ "\t\t- 这月的销售\n"
+#~ "\t\t- 待处理的报价\n"
+#~ "\t\t- 未开票但已运输的销售\n"
+#~ "    "
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 1681d7edff9..3464d7aec31 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
+# 	* sale
 #
 msgid ""
 msgstr ""
@@ -69,8 +69,7 @@ msgid "Steps To Deliver a Sale Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
 msgid "Quantity"
 msgstr ""
 
@@ -80,8 +79,7 @@ msgid "You invoice has been successfully created !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Automatic Declaration"
 msgstr ""
 
@@ -156,9 +154,7 @@ msgid "Manual Designation"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
 msgstr "注解"
@@ -169,8 +165,7 @@ msgid "Invoice after delivery"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
+#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "税"
 
@@ -230,8 +225,7 @@ msgid "Procurement is created after confirmation of sale order."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
+#: field:sale.order,project_id:0 field:sale.shop,project_id:0
 msgid "Analytic Account"
 msgstr "项目"
 
@@ -317,8 +311,7 @@ msgid "Invoice Based on Sales Orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sale Shop"
 msgstr ""
 
@@ -333,8 +326,7 @@ msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
+#: field:sale.order,order_line:0 view:sale.order.line:0
 msgid "Order Lines"
 msgstr "订单行"
 
@@ -344,8 +336,7 @@ msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
@@ -438,15 +429,13 @@ msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
+#: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
+#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
 msgid "Pricelist"
 msgstr "价格表"
 
@@ -615,8 +604,7 @@ msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr ""
 
@@ -767,8 +755,7 @@ msgid "Direct Delivery"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr ""
@@ -798,8 +785,7 @@ 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
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
@@ -850,8 +836,7 @@ msgid "Delivery Order Only"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Sales order lines"
 msgstr ""
 
@@ -861,13 +846,12 @@ msgid "Sequence"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "销售"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "Qty"
 msgstr ""
 
@@ -882,8 +866,7 @@ msgid "Other data"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr ""
@@ -909,8 +892,7 @@ msgstr ""
 #: 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
+#: 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"
@@ -927,8 +909,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "UoM"
 msgstr ""
 
@@ -1039,8 +1020,7 @@ msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
+#: rml:sale.order:0 field:sale.order.line,name:0
 msgid "Description"
 msgstr ""
 
@@ -1097,8 +1077,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
+#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
 
@@ -1110,8 +1089,7 @@ 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
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
 msgstr ""
@@ -1138,8 +1116,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: rml:sale.order:0 field:sale.order,date_order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1221,8 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
+#: view:sale.order:0 view:sale.order.line:0
 msgid "States"
 msgstr ""
 
@@ -1242,8 +1218,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
 msgid "Picked"
 msgstr ""
 
@@ -1272,3 +1247,243 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
 msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+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"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+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"
+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)"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+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"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+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)"
+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"
+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"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 26cb92d3f66..2cef2799fae 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -20,10 +20,11 @@
 ##############################################################################
 
 import time
-import netsvc
-from osv import fields, osv
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
+import netsvc
+from osv import fields, osv
 from tools import config
 from tools.translate import _
 
@@ -41,8 +42,8 @@ class sale_shop(osv.osv):
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
-sale_shop()
 
+sale_shop()
 
 def _incoterm_get(self, cr, uid, context=None):
     if context is None:
@@ -77,11 +78,11 @@ class sale_order(osv.osv):
         return val
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
+        cur_obj = self.pool.get('res.currency')
         if context is None:
             context = {}
         res = {}
-        cur_obj = self.pool.get('res.currency')
-        for order in self.browse(cr, uid, ids, context):
+        for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = {
                 'amount_untaxed': 0.0,
                 'amount_tax': 0.0,
@@ -222,15 +223,15 @@ class sale_order(osv.osv):
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="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 picking 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 'Ordered Date'.", select=True),
         'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'create_date': fields.date('Creation Date', readonly=True),
-        'date_confirm': fields.date('Confirmation Date', readonly=True),
+        'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
+        'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale 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)]}),
+        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sale 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 sale order"),
 
-        'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3),
+        'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3, 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', 'Partial Delivery'), ('one', 'Complete Delivery')],
             'Picking Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
@@ -245,16 +246,16 @@ class sale_order(osv.osv):
   - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
   - The 'Invoice from the picking' choice is used to create an invoice during the picking process."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current sale order"),
-        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
+        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sale order"),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="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)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
-        'shipped': fields.boolean('Picked', readonly=True),
+        'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done.It will set to True if the ordered quantities are available and the picking is done.If the ordered quantities are not available it generates a Purchase/Manufacturing order.Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
-            fnct_search=_invoiced_search, type='boolean'),
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid"),
         'note': fields.text('Notes'),
 
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
@@ -262,19 +263,19 @@ class sale_order(osv.osv):
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums'),
+            multi='sums', help="The amount without tax"),
         'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums'),
+            multi='sums', help="The tax amount"),
         'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
-            multi='sums'),
+            multi='sums', help="The total amount"),
 
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="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.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
@@ -283,13 +284,13 @@ class sale_order(osv.osv):
     }
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
-        'picking_policy': lambda *a: 'direct',
-        'date_order': lambda *a: time.strftime('%Y-%m-%d'),
-        'order_policy': lambda *a: 'manual',
-        'state': lambda *a: 'draft',
+        'picking_policy': 'direct',
+        'date_order': time.strftime('%Y-%m-%d'),
+        'order_policy': 'manual',
+        'state': 'draft',
         'user_id': lambda obj, cr, uid, context: uid,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
-        'invoice_quantity': lambda *a: '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'],
@@ -335,7 +336,7 @@ class sale_order(osv.osv):
             wf_service.trg_create(uid, 'sale.order', inv_id, cr)
         for (id,name) in self.name_get(cr, uid, ids):
             message = _('Sale order ') + " '" + name + "' "+ _("is in draft state")
-            self.log(cr, uid, id, message) 
+            self.log(cr, uid, id, message)
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part):
@@ -410,8 +411,16 @@ class sale_order(osv.osv):
         return {}
 
     def _make_invoice(self, cr, uid, order, lines, context=None):
+        journal_obj = self.pool.get('account.journal')
+        inv_obj = self.pool.get('account.invoice')
+
         if context is None:
             context = {}
+
+        journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', order.company_id.id)], limit=1)
+        if not journal_ids:
+            raise osv.except_osv(_('Error !'),
+                _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
         a = order.partner_id.property_account_receivable.id
         if order.payment_term:
             pay_term = order.payment_term.id
@@ -422,12 +431,6 @@ class sale_order(osv.osv):
                 for preline in preinv.invoice_line:
                     inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
                     lines.append(inv_line_id)
-        journal_obj = self.pool.get('account.journal')
-        journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', order.company_id.id)], limit=1)
-        if not journal_ids:
-            raise osv.except_osv(_('Error !'),
-                _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
-
         inv = {
             'name': order.client_order_ref or order.name,
             'origin': order.name,
@@ -447,7 +450,6 @@ class sale_order(osv.osv):
             'company_id' : order.company_id.id,
             'user_id':order.user_id and order.user_id.id or False
         }
-        inv_obj = self.pool.get('account.invoice')
         inv.update(self._inv_get(cr, uid, order))
         inv_id = inv_obj.create(cr, uid, inv, context=context)
         data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime('%Y-%m-%d'))
@@ -456,12 +458,14 @@ class sale_order(osv.osv):
         inv_obj.button_compute(cr, uid, [inv_id])
         return inv_id
 
-    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False):
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
         invoices = {}
         invoice_ids = []
-
-        context = {}
+        picking_obj = self.pool.get('stock.picking')
+        invoice = self.pool.get('account.invoice')
+        if context is None:
+            context = {}
         # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
         # last day of the last month as invoice date
         if date_inv:
@@ -474,21 +478,22 @@ class sale_order(osv.osv):
             created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
             if created_lines:
                 invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
-
         if not invoices:
             for o in self.browse(cr, uid, ids):
                 for i in o.invoice_ids:
                     if i.state == 'draft':
                         return i.id
-        picking_obj = self.pool.get('stock.picking')
         for val in invoices.values():
             if grouped:
                 res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []), context=context)
+                invoice_ref = ''
                 for o, l in val:
+                    invoice_ref += o.name + '|'
                     self.write(cr, uid, [o.id], {'state': 'progress'})
                     if o.order_policy == 'picking':
                         picking_obj.write(cr, uid, map(lambda x: x.id, o.picking_ids), {'invoice_state': 'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
+                invoice.write(cr, uid, [res], {'origin': invoice_ref, 'name': invoice_ref})
             else:
                 for order, il in val:
                     res = self._make_invoice(cr, uid, order, il, context=context)
@@ -561,19 +566,19 @@ class sale_order(osv.osv):
 
     def action_wait(self, cr, uid, ids, *args):
         product=[]
-        product_obj=self.pool.get('product.product')
+        product_obj = self.pool.get('product.product')
         for o in self.browse(cr, uid, ids):
             if (o.order_policy == 'manual'):
                 self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
             self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
-            for line in o.order_line: 
+            for line in o.order_line:
                 product.append(line.product_id.default_code)
         params = ', '.join(map(lambda x : str(x),product))
         message = _('Sale order ') + " '" + o.name + "' "+ _("created on")+" '" +o.create_date + "' "+_("for")+" '" +params  + "' "+_("is confirmed")
         self.log(cr, uid, id, message)
-
+        return True
 
     def procurement_lines_get(self, cr, uid, ids, *args):
         res = []
@@ -775,10 +780,10 @@ sale_order()
 # - use it in report if there is a uos
 class sale_order_line(osv.osv):
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        context = context or {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        res = {}
+        context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
             taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty)
@@ -836,15 +841,15 @@ class sale_order_line(osv.osv):
     }
     _order = 'sequence, id'
     _defaults = {
-        'discount': lambda *a: 0.0,
-        'delay': lambda *a: 0.0,
-        'product_uom_qty': lambda *a: 1,
-        'product_uos_qty': lambda *a: 1,
-        'sequence': lambda *a: 10,
-        'invoiced': lambda *a: 0,
-        'state': lambda *a: 'draft',
-        'type': lambda *a: 'make_to_stock',
-        'product_packaging': lambda *a: False
+        'discount': 0.0,
+        'delay': 0.0,
+        'product_uom_qty': 1,
+        'product_uos_qty': 1,
+        'sequence':  10,
+        'invoiced': 0,
+        'state': 'draft',
+        'type': 'make_to_stock',
+        'product_packaging': False
     }
 
     def invoice_line_create(self, cr, uid, ids, context=None):
@@ -936,7 +941,7 @@ class sale_order_line(osv.osv):
             context = {}
         for (id,name) in self.name_get(cr, uid, ids):
             message = _('Sale order line') + " '" + name + "' "+ _("is confirmed")
-            self.log(cr, uid, id, message)  
+            self.log(cr, uid, id, message)
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
     def button_done(self, cr, uid, ids, context=None):
@@ -1193,3 +1198,4 @@ class sale_config_picking_policy(osv.osv_memory):
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
 sale_config_picking_policy()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4bb3d603ce7..14aa80659f9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/> 
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/>
         <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"/>
@@ -169,7 +169,7 @@
                                                     states="confirmed"
                                                     string="Make Invoice"
                                                     type="action"
-                                                    icon="gtk-print" />
+                                                    icon="terp-document-new" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -203,7 +203,7 @@
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="button_dummy" states="draft" string="" type="object" icon="gtk-execute"/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
@@ -213,7 +213,7 @@
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-document-new"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
@@ -221,7 +221,7 @@
                                 <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Other data">
+                        <page string="Other Information">
                             <group colspan="2" col="2" groups="base.group_extended" name="logistic">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm"/>
@@ -249,7 +249,7 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
-                            <separator colspan="4" string="Related invoices"/>
+                            <separator colspan="4" string="Related Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
@@ -400,7 +400,7 @@
                               name="%(action_view_sale_order_line_make_invoice)d"
                               string="Make Invoice"
                               type="action"
-                              icon="gtk-print" />
+                              icon="terp-document-new" />
                             <group col="2" colspan="2">
                                 <button name="button_done"
                                     states="confirmed,exception"
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 7328793e2f3..41b1fab2d32 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -3,8 +3,6 @@
 "access_sale_order","sale.order","model_sale_order","group_sale_user",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","group_sale_user",1,1,1,0
 "access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
-"access_sale_config_picking_policy","sale.config.picking_policy","model_sale_config_picking_policy","group_sale_user",1,0,0,0
-"access_sale_config_picking_policy_manager","sale.config.picking_policy_manager","model_sale_config_picking_policy","group_sale_manager",1,1,1,1
 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","group_sale_user",1,1,1,1
 "access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","group_sale_user",1,1,1,1
 "access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","group_sale_user",1,0,0,0
@@ -17,10 +15,6 @@
 "access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1
 "access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","group_sale_manager",1,1,1,1
 "access_sale_report_manager","sale.report","model_sale_report","group_sale_manager",1,0,0,0
-"access_sale_order_line_make_invoice","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_user",1,1,1,0
-"access_sale_order_line_make_invoice_manager","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_manager",1,1,1,1
-"access_sale_advance_payment_inv","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_user",1,1,1,0
-"access_sale_advance_payment_inv_manager","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_manager",1,1,1,1
 "access_sale_open_invoice","sale.open.invoice","model_sale_open_invoice","group_sale_user",1,1,1,0
 "access_sale_open_invoice_manager","sale.open.invoice","model_sale_open_invoice","group_sale_manager",1,1,1,1
 "access_product_product_sale_user","product.product.sale.user","model_product_product","group_sale_user",1,0,0,0
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 8e5c8360d07..6eb4315fcd2 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -12,6 +12,10 @@
     <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
+    
+    <record model="ir.ui.menu" id="base.menu_base_partner">
+        <field eval="[(4, ref('sale.group_sale_user'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 48c00d8afba..b908c440b1d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/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/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@ class stock_move(osv.osv):
         'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
     }
     _defaults = {
-        'sale_line_id': lambda *a:False
+        'sale_line_id': False
     }
 stock_move()
 
@@ -37,7 +37,7 @@ class stock_picking(osv.osv):
         'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True, readonly=True),
     }
     _defaults = {
-        'sale_id': lambda *a: False
+        'sale_id': False
     }
 
     def get_currency_id(self, cursor, user, picking):
@@ -127,7 +127,7 @@ class stock_picking(osv.osv):
         for invoice in invoice_obj.browse(cursor, user, invoice_ids,
                 context=context):
             invoices[invoice.id] = invoice
-            
+
         for picking in picking_obj.browse(cursor, user, picking_ids,
                 context=context):
 
@@ -135,15 +135,15 @@ class stock_picking(osv.osv):
                 continue
             sale_lines = picking.sale_id.order_line
             invoice_created = invoices[result[picking.id]]
-            
+
             for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
                 if not inv.fiscal_position:
                     invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
-                    
+
             if picking.sale_id.client_order_ref:
                 inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
                 invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
-            
+
             for sale_line in sale_lines:
                 if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
                     if group:
@@ -189,7 +189,7 @@ class stock_picking(osv.osv):
                         })
 
         return result
-    
+
     def action_cancel(self, cr, uid, ids, context={}):
         res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context)
         for pick in self.browse(cr, uid, ids, context):
@@ -200,13 +200,9 @@ class stock_picking(osv.osv):
                         call_ship_end = False
                         break
                 if call_ship_end:
-                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context)    
+                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context)
         return res
 
-
 stock_picking()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 870b3ec0428..8b93b031d39 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -65,7 +65,6 @@
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
-    company_id: base.main_company
     currency_mode: current
     name: Receivable
     parent_id: account_account_minimalchart0
@@ -79,7 +78,6 @@
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
-    company_id: base.main_company
     currency_mode: current
     name: Cash
     parent_id: account_account_minimalchart0
@@ -142,7 +140,6 @@
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
-    company_id: base.main_company
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
index cd33b1bc73e..ce344bb23ae 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -2,41 +2,41 @@
   In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
 -
   I am going to sell my Mobile products to the customer with name Cleartrail
-- 
+-
   I create View Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
-- 
+-
   I create Income Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
-- 
+-
   I create Expense Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
-- 
+-
   I create Cash Account Type.
-- 
+-
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
-- 
+-
   I create Minimal Chart Account.
-- 
+-
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
     company_id: base.main_company
@@ -46,9 +46,9 @@
     parent_right: 12
     type: view
     user_type: account_account_type_view0
-- 
+-
   I create Payable Account.
-- 
+-
   !record {model: account.account, id: account_account_payable1}:
     code: AP
     company_id: base.main_company
@@ -60,12 +60,11 @@
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
-- 
+-
   I create Receivable Account.
-- 
+-
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
-    company_id: base.main_company
     currency_mode: current
     name: Receivable
     parent_id: account_account_minimalchart0
@@ -74,12 +73,11 @@
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
-- 
+-
   I create Cash Account.
-- 
+-
   !record {model: account.account, id: account_account_cash0}:
     code: C
-    company_id: base.main_company
     currency_mode: current
     name: Cash
     parent_id: account_account_minimalchart0
@@ -87,9 +85,9 @@
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
-- 
+-
   I create Purchases Account.
-- 
+-
   !record {model: account.account, id: account_account_purchases0}:
     code: P
     company_id: base.main_company
@@ -100,9 +98,9 @@
     parent_right: 9
     type: other
     user_type: account_account_type_expense0
-- 
+-
   I create Sales Account.
-- 
+-
   !record {model: account.account, id: account_account_sales0}:
     code: S
     company_id: base.main_company
@@ -113,9 +111,9 @@
     parent_right: 11
     type: other
     user_type: account_account_type_income0
-- 
+-
   I create Purchase Journal.
-- 
+-
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
     company_id: base.main_company
@@ -125,9 +123,9 @@
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
-- 
+-
   I create Sale Journal.
-- 
+-
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
     company_id: base.main_company
@@ -137,84 +135,83 @@
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
-- 
+-
   I create Bank Journal.
-- 
+-
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
-    company_id: base.main_company
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
-- 
+-
   I create ir.property for account payable.
-- 
+-
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
-- 
+-
   I create ir.property for account receivable.
-- 
+-
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_receivable
     name: property_account_income_categ
     value_reference: account.account,6
-- 
+-
   I create Partner category Customers.
-- 
+-
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
   I create Cleartrail Customer.
-- 
+-
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
-- 
+-
   I create contact address for Cleartrail.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
-- 
+-
   I create invoice address for Cleartrail.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
     street: sarda house 24 B palasia, A B Road
     type: invoice
-- 
+-
   I create delivery address for Cleartrail.
-- 
+-
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
   Customer Cleartrail has specific instrument requirement regarding the stockable products.
-- 
+-
   I define product category Mobile Products Sellable.
-- 
+-
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
-    
-    
-- 
-  I define product category Mobile Services. 
-- 
+
+
+-
+  I define product category Mobile Services.
+-
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
-- 
+-
   I define LG Viewty Smart product template.
-- 
+-
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
     cost_method: standard
@@ -227,9 +224,9 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
--    
+-
   I define LG Viewty Smart product.
-- 
+-
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
     cost_method: standard
@@ -249,7 +246,7 @@
     uom_po_id: product.product_uom_unit
 -
   I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
-- 
+-
   !record {model: sale.order, id: sale_order_so1}:
     date_order: '2010-05-03'
     invoice_quantity: order
@@ -273,11 +270,11 @@
     picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.shop
-    
-    
-- 
+
+
+-
   I confirm the sale order.
-- 
+-
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
 -
   I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
@@ -285,67 +282,67 @@
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so1"))
     assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
-- 
+-
   I open the Invoice for the SO.
-- 
+-
   !python {model: account.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
     import netsvc
-    wf_service = netsvc.LocalService("workflow")  
+    wf_service = netsvc.LocalService("workflow")
     invoice_ids = so.invoice_ids
     for invoice in invoice_ids:
-      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
 -
   Creating a account invoice pay entry.
-- 
+-
   !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
     amount: 85000.0
     date: '2010-05-10'
     journal_id: sale.account_journal_bankjournal0
     name: tst
     period_id: account.period_5
-- 
+-
   I pay the invoice.
-- 
+-
   !python {model: account.invoice.pay}: |
     sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))  
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
     self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
       False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
       "out_invoice", "active_id": so.invoice_ids[0].id, })
-    
-    
-- 
+
+
+-
   Creating an account invoice pay writeoff entry.
-- 
+-
   !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
     analytic_id: account.analytic_customers
     comment: Write-Off
     writeoff_acc_id: account.a_sale
     writeoff_journal_id: sale.account_journal_bankjournal0
-    
-    
-- 
+
+
+-
   Pay and Reconcile the Invoice.
-- 
+-
   !python {model: account.invoice.pay.writeoff}: |
     sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))   
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
     self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
       {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
       [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
-    
-    
+
+
 -
   I will verify the picking associated with the sale order sale_order_so1
-- 
+-
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so1"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so1"
-- 
+-
   Products are delivered to the Cleartrail Customer.
-- 
+-
   !python {model: stock.picking }: |
    import time
    sale_order_obj = self.pool.get('sale.order')
@@ -371,9 +368,9 @@
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))  
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   
+
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
index e34b11ffb2b..c5860ed875e 100644
--- a/addons/sale/test/so_make_invoice.yml
+++ b/addons/sale/test/so_make_invoice.yml
@@ -65,7 +65,6 @@
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
-    company_id: base.main_company
     currency_mode: current
     name: Receivable
     parent_id: account_account_minimalchart0
@@ -79,7 +78,6 @@
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
-    company_id: base.main_company
     currency_mode: current
     name: Cash
     parent_id: account_account_minimalchart0
@@ -142,7 +140,6 @@
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
-    company_id: base.main_company
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
index de5782c8517..c09e4bf2c11 100644
--- a/addons/sale/test/so_make_line_invoice.yml
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -65,7 +65,6 @@
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
-    company_id: base.main_company
     currency_mode: current
     name: Receivable
     parent_id: account_account_minimalchart0
@@ -79,7 +78,6 @@
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
-    company_id: base.main_company
     currency_mode: current
     name: Cash
     parent_id: account_account_minimalchart0
@@ -142,7 +140,6 @@
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
-    company_id: base.main_company
     default_credit_account_id: account_account_cash0
     default_debit_account_id: account_account_cash0
     name: Bank Journal
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 0420a8c3404..eb9100c6777 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Create invoices">
-    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 0ce2705ac77..850fc2e25d4 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -26,7 +26,7 @@ class sale_make_invoice(osv.osv_memory):
     _name = "sale.make.invoice"
     _description = "Sale Make Invoice"
     _columns = {
-        'grouped': fields.boolean('Group the invoices'),
+        'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
         'invoice_date':fields.date('Invoice Date'),
     }
     _default = {
@@ -50,11 +50,11 @@ class sale_make_invoice(osv.osv_memory):
         for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
             for i in o.invoice_ids:
                 newinv.append(i.id)
-        
+         
         mod_obj =self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         
-        id = mod_obj.read(cr, uid, result, ['res_id'])                
+        id = mod_obj.read(cr, uid, result, ['res_id'])   
         return {
             'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
             'name': 'Invoices',
@@ -64,7 +64,7 @@ class sale_make_invoice(osv.osv_memory):
             'view_id': False,
             'context': "{'type':'out_refund'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': id['id']                
+            'search_view_id': id['res_id']                
         }
 
 sale_make_invoice()        
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ade720be1f4..9884aa1f021 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -6,14 +6,15 @@
             <field name="model">sale.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Create invoices">
-				<separator colspan="4" string="Do you really want to create the invoices ?" />
-    			<field name="grouped" />
+            <form string="Create invoices">
+            	<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
+    			<field name="grouped"/>
+    			<newline/>
     			<field name="invoice_date"/>
-             	<separator string="" colspan="6" />
+    		   	<separator string="" colspan="6"/>
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
-             </form>
+           		</form>
             </field>
 		</record>
 
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index a1ce96418b5..d4287dc9b7e 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index b55ca670e07..31f1cc9c327 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -19,16 +19,12 @@
 #
 ##############################################################################
 import time
-from mx import DateTime
 
-import netsvc
 from osv import fields, osv
-import ir
-from tools import config
 
 class sale_order_line(osv.osv):
-    _name='sale.order.line'
-    _inherit='sale.order.line'
+    _name = 'sale.order.line'
+    _inherit = 'sale.order.line'
     _columns = {
         'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
     }
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index db6bcd832b3..ca0230b1ddf 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -23,7 +23,6 @@ from osv import fields, osv
 from tools.translate import _
 from mx.DateTime import now
 
-
 class crm_make_sale(osv.osv_memory):
     """ Make sale  order for crm """
 
@@ -63,16 +62,14 @@ class crm_make_sale(osv.osv_memory):
             context = {}
             
         mod_obj = self.pool.get('ir.model.data')
-
-
-        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])
-
         case_obj = self.pool.get('crm.lead')
         sale_obj = self.pool.get('sale.order')
         partner_obj = self.pool.get('res.partner')
         sale_line_obj = self.pool.get('sale.order.line')
         
+        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        
         data = context and context.get('active_ids', []) or []
              
         for make in self.browse(cr, uid, ids):  
@@ -149,8 +146,6 @@ class crm_make_sale(osv.osv_memory):
                     'res_id': new_ids and new_ids[0]
 
                 }
-
-                
             else:
                 value = {
                     'domain': str([('id', 'in', new_ids)]),
@@ -159,24 +154,23 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
-                    'res_id':new_ids
+                    'res_id': new_ids
                     }
             return value
 
-
     _columns = {
-        'shop_id': fields.many2one('sale.shop', 'Shop', required = True),
-        'partner_id': fields.many2one('res.partner', 'Customer',  required = True,  help = 'Use this partner if there is no partner on the Opportunity'),
+        'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
+        'partner_id': fields.many2one('res.partner', 'Customer', required=True, help='Use this partner if there is no partner on the Opportunity'),
         'picking_policy': fields.selection([('direct','Partial Delivery'),
-                                            ('one','Complete Delivery')], 'Picking Policy', required = True),
+                                            ('one','Complete Delivery')], 'Picking Policy', required=True),
         'product_ids': fields.many2many('product.product', 'product_sale_rel',\
                          'sale_id', 'product_id', 'Products'),
         'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),   
-        'close': fields.boolean('Close Case', help = 'Check this to close the case after having created the sale order.'),              
+        'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),              
     }
     _defaults = {
          'partner_id': _selectPartner,
-         'close': lambda *a: 1
+         'close': 1
     }
     
 crm_make_sale()
diff --git a/addons/sale_delivery_report/__openerp__.py b/addons/sale_delivery_report/__openerp__.py
index a5f6cc437fd..dfcbe1acb29 100644
--- a/addons/sale_delivery_report/__openerp__.py
+++ b/addons/sale_delivery_report/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@
     'depends': ['sale', 'delivery'],
     'init_xml': [],
     'update_xml': [
-        'delivery_report.xml'
+        'sale_delivery_report.xml'
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/sale_delivery_report/delivery_report.xml b/addons/sale_delivery_report/sale_delivery_report.xml
similarity index 100%
rename from addons/sale_delivery_report/delivery_report.xml
rename to addons/sale_delivery_report/sale_delivery_report.xml
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 94d343debb9..80643eb5d4d 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Managing sales and deliveries by journal',
     'version': '1.0',
@@ -49,7 +48,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['stock', 'sale'],
+    'depends': ['sale'],
     'init_xml': ['sale_journal_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index c2bfada3ab3..f3af787b5ff 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index fc132424fd7..4f275505e95 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
 
 from osv import osv, fields
 import netsvc
-import time
 from tools.translate import _
 
 class sale_journal_invoice_type(osv.osv):
@@ -34,8 +34,8 @@ class sale_journal_invoice_type(osv.osv):
         'invoicing_method': fields.selection([('simple','Non grouped'),('grouped','Grouped')], 'Invoicing method', required=True),
     }
     _defaults = {
-        'active': lambda *a: True,
-        'invoicing_method': lambda *a:'simple'
+        'active': True,
+        'invoicing_method': 'simple'
     }
 sale_journal_invoice_type()
 
@@ -53,18 +53,21 @@ class sale_journal(osv.osv):
         'state': fields.selection([
             ('draft','Draft'),
             ('open','Open'),
+            ('cancel','Cancel'),
+            ('confirm','Confirm'),
             ('done','Done'),
         ], 'State', required=True, readonly=True),
         'note': fields.text('Note'),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_created': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': time.strftime('%Y-%m-%d'),
+        'date_created': time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr,uid,context: uid,
         'state': lambda self,cr,uid,context: 'draft',
     }
-    
+
     def button_sale_cancel(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'cancel'})
         for id in ids:
             sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
             for saleid in sale_ids:
@@ -72,10 +75,11 @@ class sale_journal(osv.osv):
                 wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
             for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale order of Journal') + " '" + name + "' "+ _("is cancelled")
-                self.log(cr, uid, id, message)  
+                self.log(cr, uid, id, message)
         return True
-    
+
     def button_sale_confirm(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'confirm'})
         for id in ids:
             sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
             for saleid in sale_ids:
@@ -83,30 +87,45 @@ class sale_journal(osv.osv):
                 wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
             for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale orders of Journal') + " '" + name + "' "+ _("is confirmed")
-                self.log(cr, uid, id, message)    
+                self.log(cr, uid, id, message)
         return True
 
     def button_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'open'})
         for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale orders of Journal') + " '" + name + "' "+ _("is opened")
-                self.log(cr, uid, id, message)  
+                self.log(cr, uid, id, message)
         return True
-    
+
     def button_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'})
         for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
-                self.log(cr, uid, id, message)  
+                self.log(cr, uid, id, message)
         return True
-    
+
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'done', 'date_validation':time.strftime('%Y-%m-%d')})
         for (id,name) in self.name_get(cr, uid, ids):
                 message = _('Sale orders of Journal') + " '" + name + "' "+ _("is closed")
-                self.log(cr, uid, id, message)  
+                self.log(cr, uid, id, message)
         return True
     
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if context is None:
+            context = {}
+        if default is None:
+            default = {}
+        default.update({'sale_stats_ids': []})
+        return super(sale_journal, self).copy(cr, uid, id, default=default, context=context)
+
 sale_journal()
 
 class picking_journal(osv.osv):
@@ -123,6 +142,7 @@ class picking_journal(osv.osv):
         'state': fields.selection([
             ('draft','Draft'),
             ('open','Open'),
+            ('cancel','Cancel'),
             ('done','Done'),
         ], 'Creation date', required=True, readonly=True),
         'note': fields.text('Note'),
@@ -134,6 +154,7 @@ class picking_journal(osv.osv):
         'state': lambda self,cr,uid,context: 'draft',
     }
     def button_picking_cancel(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'cancel'})
         for id in ids:
             pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
             for pickid in pick_ids:
@@ -149,6 +170,22 @@ class picking_journal(osv.osv):
     def button_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'done', 'date_validation':time.strftime('%Y-%m-%d')})
         return True
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if context is None:
+            context = {}
+        if default is None:
+            default = {}
+        default.update({'picking_stats_ids': []})
+        return super(picking_journal, self).copy(cr, uid, id, default=default, context=context)
+    
 picking_journal()
 
 #==============================================
@@ -171,18 +208,18 @@ class res_partner(osv.osv):
 res_partner()
 
 class picking(osv.osv):
-    _inherit="stock.picking"
+    _inherit = "stock.picking"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal'),
+        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal',  domain=[('state','!=', 'done')]),
         'sale_journal_id': fields.many2one('sale_journal.sale.journal', 'Sale Journal'),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
 picking()
 
 class sale(osv.osv):
-    _inherit="sale.order"
+    _inherit = "sale.order"
     _columns = {
-        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal'),
+        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', domain=[('state','!=', 'done')]),
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
     }
     def action_ship_create(self, cr, uid, ids, *args):
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 70b12997c54..052d7e09777 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -78,10 +78,10 @@
                     <field name="state"/>
                         <group col="6" colspan="2">
                             <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-                            <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button name="button_close" string="Close Journal" states="open,confirm" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open,cancel" type="object" icon="gtk-convert"/>
                             <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
-                            <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                            <button string="Cancel Sales" name="button_sale_cancel" states="draft,open,confirm" type="object" icon="gtk-cancel"/>
                         </group>
                 </form>
             </field>
@@ -113,13 +113,16 @@
             <field name="arch" type="xml">
                 <search string="Sales by Journal">
                     <group col="8" colspan="4">
-                        <filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
-                           <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
-                           <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
+						<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Sale Journals which are in draft state"/>
+                        <filter icon="gtk-open" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Sale Journals which are cancelled"/>
+                        <filter icon="terp-check" string="Confirm" domain="[('state','=','confirm')]" help="Confirmed Sale Journals"/>
+                        <filter icon="terp-camera_test" string="Close" domain="[('state','=','done')]" help="Sale Journals which are closed"/>
+                       <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="user_id"/>
+                        <field name="date"/>
                     </group>
                 </search>
             </field>
@@ -131,6 +134,7 @@
             <field name="res_model">sale_journal.sale.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_sale_journal_search"/>
         </record>
 
@@ -386,7 +390,7 @@
                         <group col="6" colspan="2">
                             <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
                             <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open,cancel" type="object" icon="gtk-convert"/>
                             <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
                         </group>
                 </form>
@@ -417,13 +421,15 @@
             <field name="arch" type="xml">
                 <search string="Picking Journals">
                     <group col="8" colspan="4">
-                        <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Picking Journals which are in draft state"/>
+					   	<filter icon="gtk-open" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+					   	<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Picking Journals which are cancelled"/>
+					   	<filter icon="terp-camera_test" string="Close" domain="[('state','=','done')]" help="Picking Journals which are closed"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="user_id"/>
+                        <field name="date"/>
                     </group>
                 </search>
             </field>
@@ -436,6 +442,7 @@
             <field name="res_model">sale_journal.picking.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_picking_journal_search"/>
         </record>
 
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
new file mode 100644
index 00000000000..0b59e7db3f6
--- /dev/null
+++ b/addons/sale_margin/i18n/sl.po
@@ -0,0 +1,370 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 14:28+0000\n"
+"PO-Revision-Date: 2010-07-02 12:17+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\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: 2010-07-03 03:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Refund"
+msgstr "Dobropis kupcu"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "report.account.invoice.product"
+msgstr ""
+
+#. module: sale_margin
+#: constraint:ir.model:0
+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!"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
+msgid "Invoices by Product"
+msgstr "Računi po proizvodih"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Customer Invoice"
+msgstr "Izdan račun"
+
+#. module: sale_margin
+#: wizard_view:stock.invoice_onshipping,init:0
+msgid "Create invoices"
+msgstr "Ustvari račune"
+
+#. module: sale_margin
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
+msgid "report.account.invoice.partner.product"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Invoice"
+msgstr "Račun dobavitelja"
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: sale_margin
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Napačno ime modela v definiciji dejanja."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
+msgid "All Months"
+msgstr "Vsi meseci"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
+msgid "report.account.invoice.partner.product.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Vrsta"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Supplier Invoices"
+msgstr "Računi dobaviteljev"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner:0
+msgid "Invoices by partner"
+msgstr "Računi po partnerjih"
+
+#. module: sale_margin
+#: view:report.account.invoice.category:0
+msgid "Invoices by category"
+msgstr "Računi po vrstah"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Plačano"
+
+#. module: sale_margin
+#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
+#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+msgid "Create invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
+msgid "report.account.invoice.category.tree"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
+msgid "Invoices by Partner and Product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_category
+msgid "report.account.invoice.category"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Ta mesec"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Lastna cena"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,group:0
+msgid "Group by partner"
+msgstr "Združi po partnerjih"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
+msgid "report.account.invoice.partner"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
+msgid "Invoices by Partner"
+msgstr "Računi po partnerju"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
+msgid "Invoices by Category"
+msgstr "Računi po kategorijah"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner.product:0
+msgid "Invoices by partner and product"
+msgstr "Računi po partnerjih in proizvodih"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
+msgid "Invoiced date"
+msgstr "Datum izdaje računa"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+msgid "Supplier Refund"
+msgstr "Dobropis dobavitelja"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
+msgid "report.account.invoice.partner.tree"
+msgstr ""
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Rob"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Računi po proizvodih"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sale Orders"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice
+msgid "report.account.invoice"
+msgstr ""
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Preklicano"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_margin
+#: wizard_button:stock.invoice_onshipping,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
+msgid "report.account.invoice.tree"
+msgstr ""
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
+msgid "report.account.invoice.product.tree"
+msgstr ""
diff --git a/addons/sale_margin/invoice_margin.py b/addons/sale_margin/invoice_margin.py
index a00311cbd7d..aad746ce903 100644
--- a/addons/sale_margin/invoice_margin.py
+++ b/addons/sale_margin/invoice_margin.py
@@ -29,15 +29,15 @@ class account_invoice_line(osv.osv):
         'cost_price': fields.float('Cost Price', digits=(16, 2)),
     }
     def write(self, cr, uid, ids, vals, context={}):
-        if vals.get('product_id' , False):
-            res=self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
-            vals['cost_price']=res[0]['standard_price']
+        if vals.get('product_id', False):
+            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
+            vals['cost_price'] = res[0]['standard_price']
         return super(account_invoice_line, self).write(cr, uid, ids, vals, context)
 
     def create(self, cr, uid, vals, context={}):
         if vals.get('product_id',False):
-            res=self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
-            vals['cost_price']=res[0]['standard_price']
+            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
+            vals['cost_price'] = res[0]['standard_price']
         return super(account_invoice_line, self).create(cr, uid, vals, context)
 account_invoice_line()
 
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 77f7be55342..80bb542fa3d 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -25,7 +25,18 @@ from tools import config
 class sale_order_line(osv.osv):
     _name = "sale.order.line"
     _inherit = "sale.order.line"
-    def _product_margin(self, cr, uid, ids, field_name, arg, context):
+
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
+        res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,
+            uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
+        purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
+        res['value'].update({'purchase_price':purchase_price})
+        return res
+
+    def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for line in self.browse(cr, uid, ids):
             res[line.id] = 0
@@ -46,7 +57,7 @@ sale_order_line()
 class sale_order(osv.osv):
     _inherit = "sale.order"
 
-    def _product_margin(self, cr, uid, ids, field_name, arg, context):
+    def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
         for sale in self.browse(cr, uid, ids, context=context):
             result[sale.id] = 0.0
@@ -69,14 +80,13 @@ class stock_picking(osv.osv):
 
     def create_invoice(self, cr, uid, ids, *args):
         # need to carify with new requirement
-        res = False
         invoice_ids = []
         margin_deduce = 0.0
         picking_obj = self.pool.get('stock.picking')
         picking_obj.write(cr, uid, ids, {'invoice_state' : '2binvoiced'})
         res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
         invoice_ids = res.values()
-        picking_obj.write(cr, uid, ids,{'invoice_ids':[[6,0,invoice_ids]]})
+        picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]})
         return True
 
 stock_picking()
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 1b46a850df8..0b470ec824c 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -13,6 +13,31 @@
 			</field>
 		</field>
 	</record>
+	
+	<record model="ir.ui.view" id="sale_margin_sale_order_line">
+		<field name="name">sale.order.line.margin.view.form</field>
+		<field name="type">form</field>
+		<field name="model">sale.order</field>
+		<field name="inherit_id" ref="sale.view_order_form" />
+		<field name="arch" type="xml">
+			<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+				<field name="purchase_price"/>
+			</xpath>
+		</field>
+	</record>
+	
+	<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
+		<field name="name">sale.order.line.tree.margin.view.form</field>
+		<field name="type">form</field>
+		<field name="model">sale.order</field>
+		<field name="inherit_id" ref="sale.view_order_form" />
+		<field name="arch" type="xml">
+		   <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
+				<field name="purchase_price"/>
+			</xpath>
+		</field>
+	</record>
+	
 	<record model="ir.ui.view" id="sale_margin_sale_order_tree">
 		<field name="name">sale.order.margin.view.tree</field>
 		<field name="type">tree</field>
@@ -24,7 +49,7 @@
 			</field>
 		</field>
 	</record>
-
+   
 	<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
 		<field name="name">sale.order.margin.line.view.tree</field>
 		<field name="type">tree</field>
@@ -42,7 +67,7 @@
 		<field name="name">picking.margin.view.form</field>
 		<field name="type">form</field>
 		<field name="model">stock.picking</field>
-		<field name="inherit_id" ref="stock.view_picking_out_form" />
+		<field name="inherit_id" ref="stock.view_picking_in_form" />
 		<field name="arch" type="xml">
 			<notebook colspan="4">
 			<page string="Supplier Invoices">
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 9ac55911983..1496e46c87e 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -25,9 +25,10 @@
     'version': '1.0',
     'category': 'Generic Modules/Sales & MRP',
     'description': """
-    This module provides facility to the user to install mrp and sale modules 
-    at a time. It is basically used when we want to keep track of production 
+    This module provides facility to the user to install mrp and sale modules
+    at a time. It is basically used when we want to keep track of production
     orders generated from sale orders.
+    It adds sale name and sale Reference on production order
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/sale_mrp/i18n/en_US.po b/addons/sale_mrp/i18n/en_US.po
new file mode 100644
index 00000000000..44811d945f5
--- /dev/null
+++ b/addons/sale_mrp/i18n/en_US.po
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_mrp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-06-28 09:21:25+0000\n"
+"PO-Revision-Date: 2010-06-28 09:21: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: \n"
+"Plural-Forms: \n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid "\n"
+"    This module provides facility to the user to install mrp and sale modules\n"
+"    at a time. It is basically used when we want to keep track of production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""
+
diff --git a/addons/sale_mrp/i18n/fr.po b/addons/sale_mrp/i18n/fr.po
new file mode 100644
index 00000000000..44811d945f5
--- /dev/null
+++ b/addons/sale_mrp/i18n/fr.po
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_mrp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-06-28 09:21:25+0000\n"
+"PO-Revision-Date: 2010-06-28 09:21: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: \n"
+"Plural-Forms: \n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid "\n"
+"    This module provides facility to the user to install mrp and sale modules\n"
+"    at a time. It is basically used when we want to keep track of production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""
+
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
new file mode 100644
index 00000000000..44811d945f5
--- /dev/null
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_mrp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-06-28 09:21:25+0000\n"
+"PO-Revision-Date: 2010-06-28 09:21: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: \n"
+"Plural-Forms: \n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid "\n"
+"    This module provides facility to the user to install mrp and sale modules\n"
+"    at a time. It is basically used when we want to keep track of production\n"
+"    orders generated from sale orders.\n"
+"    It adds sale name and sale Reference on production order\n"
+"    "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""
+
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 4f52cb7dd9b..b5e91bc76ac 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -24,7 +24,7 @@ from osv import osv, fields
 
 class mrp_production(osv.osv):
     _inherit = 'mrp.production'
-    
+
     def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
         """ Finds reference of sale order for production order.
         @param field_names: Names of fields.
@@ -32,48 +32,48 @@ class mrp_production(osv.osv):
         @return: Dictionary of values.
         """
         if not field_names:
-            field_names=[]
+            field_names = []
         res = {}
         for id in ids:
             res[id] = {}.fromkeys(field_names, False)
-        for f in field_names:  
-            field_name = False          
-            if f=='sale_name':
+        for f in field_names:
+            field_name = False
+            if f == 'sale_name':
                 field_name = 'name'
             if f=='sale_ref':
-                field_name = 'client_order_ref'                           
+                field_name = 'client_order_ref'
             for key, value in self._get_sale_ref(cr, uid, ids, field_name).items():
                 res[key][f] = value
         return res
-        
+
     def _get_sale_ref(self, cr, uid, ids, field_name=False):
         move_obj=self.pool.get('stock.move')
-        
+
         def get_parent_move(move_id):
             move = move_obj.browse(cr, uid, move_id)
             if move.move_dest_id:
                 return get_parent_move(move.move_dest_id.id)
             return move_id
-            
-        productions = self.read(cr, uid, ids, ['id','move_prod_id'])       
+
+        productions = self.read(cr, uid, ids, ['id','move_prod_id'])
         res={}
         for production in productions:
             res[production['id']] = False
             if production.get('move_prod_id',False):
                 parent_move_line = get_parent_move(production['move_prod_id'][0])
                 if parent_move_line:
-                    move = move_obj.browse(cr,uid,parent_move_line)                    
+                    move = move_obj.browse(cr,uid,parent_move_line)
                     if field_name == 'name':
                         res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.name or False
                     if field_name=='client_order_ref':
                         res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
         return res
-    
+
     _columns = {
         'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
         'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
     }
-    
+
 mrp_production()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index a595e9471be..ced19625784 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <record id="view_mrp_production_form" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
@@ -14,5 +14,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index 0f7a56fba20..2fa7fad6ca1 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -34,11 +34,11 @@ Add commitment, requested and effective dates on the sale order.
     ],
 
     'update_xml': [
-        'sale_view.xml',
+        'sale_order_dates_view.xml',
     ],
     'demo_xml': [
-    ], 
-    'test': [], 
+    ],
+    'test': [],
     'installable': True,
     'active': False,
 }
diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale_order_dates.py
similarity index 100%
rename from addons/sale_order_dates/sale.py
rename to addons/sale_order_dates/sale_order_dates.py
diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
similarity index 100%
rename from addons/sale_order_dates/sale_view.xml
rename to addons/sale_order_dates/sale_order_dates_view.xml
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index ef126618f84..614ef493e96 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -305,23 +305,34 @@ class scrum_meeting(osv.osv):
     }
 
     def button_send_to_master(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         meeting_id = self.browse(cr, uid, ids)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email:
-            self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
+            res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
+            if not res:
+                raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name))
         else:
             raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
         return True
 
     def button_send_product_owner(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        context.update({'button_send_product_owner': True})
         meeting_id = self.browse(cr, uid, ids)[0]
         if meeting_id.sprint_id.product_owner_id.user_email:
-            self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
+            res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
+            if not res:
+                raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name))
         else:
             raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
         return True
 
     def email_send(self, cr, uid, ids, email, context=None):
+        if context is None:
+            context = {}
         email_from = tools.config.get('email_from', False)
         meeting_id = self.browse(cr,uid,ids)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
@@ -332,7 +343,7 @@ class scrum_meeting(osv.osv):
         sub_name = meeting_id.name or 'Scrum Meeting of %s '%meeting_id.date
         flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
         if not flag:
-            raise osv.except_osv(_('Error !'), _(' Email Not send to %s!' % meeting_id.sprint_id.product_owner_id.name))
+            return False
         return True
 
 scrum_meeting()
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9a0e4a1f9e6..db4d5d7af81 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -43,7 +43,7 @@
                     <field name="expected_hours" sum="Planned hours" widget="float_time"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-execute"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                     <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
@@ -61,7 +61,7 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-      					<button name="button_postpone" string="Post Pone" type="object"                  
+      					<button name="button_postpone" string="Post Pone" type="object"
 						help="Post Pone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
@@ -206,7 +206,7 @@
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="expected_hours" sum="Planned hours" widget="float_time"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-execute"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 0c13e83cd84..5cf24cc8228 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -43,8 +43,7 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem id="menu_board_warehouse_main" name="Warehouse" parent="base.dashboard"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_board_warehouse_main" sequence="1"/>
+		<menuitem icon="terp-graph" id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/product.py b/addons/stock/product.py
index df34b9b86a1..7c62599dac8 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -69,6 +69,8 @@ class product_product(osv.osv):
         property_obj=self.pool.get('ir.property')
         product_obj=self.browse(cr,uid,ids)[0]
         account_variation = product_obj.categ_id.property_stock_variation
+        account_variation_id = account_variation and account_variation.id or False
+        if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s' % (product_obj.categ_id.name)))
         move_ids = []        
         loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
@@ -82,13 +84,10 @@ class product_product(osv.osv):
                 product = self.browse(cr, uid, rec_id, context=c)
                 qty = product.qty_available
                 diff = product.standard_price - new_price 
-                assert diff, _("Could not find any difference between standard price and new price!")
+                if not diff: raise osv.except_osv(_('Error!'), _("Could not find any difference between standard price and new price!"))
                 if qty:
-                    location_account = account_variation and account_variation.id or False
-                    
                     company_id = location.company_id and location.company_id.id or False                    
-                    assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
-                    assert company_id, _('Company is not specified in Location')
+                    if not company_id: raise osv.except_osv(_('Error!'), _('Company is not specified in Location'))
                     #
                     # Accounting Entries
                     #
@@ -129,8 +128,8 @@ class product_product(osv.osv):
                                     'move_id': move_id,
                                     })
                         move_line_obj.create(cr, uid, {
-                                    'name': location.name,
-                                    'account_id': location_account,
+                                    'name': product.categ_id.name,
+                                    'account_id': account_variation_id,
                                     'credit': amount_diff,
                                     'move_id': move_id
                                     })
@@ -155,8 +154,8 @@ class product_product(osv.osv):
                                     'move_id': move_id
                                     })
                         move_line_obj.create(cr, uid, {
-                                    'name': location.name,
-                                    'account_id': location_account,
+                                    'name': product.categ_id.name,
+                                    'account_id': account_variation_id,
                                     'debit': amount_diff,
                                     'move_id': move_id
                                     })                   
@@ -349,7 +348,8 @@ class product_product(osv.osv):
                 if location_info.usage == 'inventory':
                     if fields.get('virtual_available'):
                         res['fields']['virtual_available']['string'] = _('Future P&L')
-                    res['fields']['qty_available']['string'] = _('P&L Qty')
+                    if fields.get('qty_available'):                        
+                        res['fields']['qty_available']['string'] = _('P&L Qty')
 
                 if location_info.usage == 'procurement':
                     if fields.get('virtual_available'):
@@ -428,7 +428,7 @@ class product_category(osv.osv):
         'property_stock_variation': fields.property('account.account', 
             type='many2one',
             relation='account.account',
-            string="Stock variation Account",
+            string="Stock Variation Account",
             method=True, view_load=True,  
             help="This account will be used in product when valuation type is real-time valuation ",),
     }
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 36ba20b3b05..1d8db4f0228 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -26,6 +26,7 @@
                         <separator string="Accounting Stock Properties" colspan="2"/>
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_variation"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 7ecb0b833e9..3ab3905f083 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -7,7 +7,6 @@
 "access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
 "access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
-"access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1
 "access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0
 "access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1
 "access_stock_production_lot","stock.production.lot","model_stock_production_lot","stock.group_stock_user",1,1,1,0
@@ -21,35 +20,6 @@
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
 "access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1
 "access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
-"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,1,1,1
-"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,1,1,1
-"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,1,1,1
-"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,1,1,1
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,1,1,1
-"access_stock_move_split_lines_exist","stock.move.split.lines.exist","model_stock_move_split_lines_exist","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_set_stock_zero","stock.inventory.set.stock.zero","model_stock_inventory_set_stock_zero","stock.group_stock_user",1,1,1,1
-"access_stock_fill_inventory","stock.fill.inventory","model_stock_fill_inventory","stock.group_stock_user",1,1,1,1
 "access_stock_inventory_line_split","stock.inventory.line.split","model_stock_inventory_line_split","stock.group_stock_user",1,1,1,1
-"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,1,1,1
-"access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,1,1,1
-"access_stock_location_product_manager","stock.location.product manager","model_stock_location_product","stock.group_stock_manager",1,1,1,1
-"access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,1,1,1
-"access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,1,1,1
-"access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,1,1,1
-"access_stock_traceability_lot_downstream","stock.traceability.lot.downstream","model_stock_traceability_lot_downstream","stock.group_stock_user",1,1,1,1
-"access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking",,1,1,1,1
-"access_stock_partial_move","stock.partial.move","model_stock_partial_move",,1,1,1,1
-"access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
-"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
-"access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
-"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,0,0,0
-"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
 "access_report_stock_move","report.stock.move","model_report_stock_move","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory","report.stock.inventory","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_replacement","stock.replacement","model_stock_replacement","stock.group_stock_user",1,1,1,1
-"access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
-"access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
-"access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
-"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
-"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
-"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index acc4378398e..cf3026494aa 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -542,7 +542,7 @@ class stock_picking(osv.osv):
         }
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         if not vals.get('auto_picking', False):
-            message = type_list.get(vals.get('type', ''), _('Picking') + " '" + vals.get('name', 'n/a') + _(" with origin")+" '" + (vals.get('origin', '') or 'n/a') + "' "+ _("is created."))
+            message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + _(" with origin")+" '" + (vals.get('origin') or "n/a") + "' "+ _("is created.")
             self.log(cr, user, new_id, message)
         return new_id
 
@@ -670,6 +670,8 @@ class stock_picking(osv.osv):
         """
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
+            if not pick.move_lines:
+                raise osv.except_osv(_('Error !'),_('You can not process picking without stock moves'))
             wf_service.trg_validate(uid, 'stock.picking', pick.id,
                 'button_confirm', cr)
             #move_ids = [x.id for x in pick.move_lines]
@@ -1378,9 +1380,9 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
-        'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+        'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
-        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
+        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin",store=True),
         'scraped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scraped'),
     }
     _constraints = [
@@ -2154,17 +2156,17 @@ class stock_move(osv.osv):
 
         for move in complete:
             self.action_done(cr, uid, [move.id], context)
-
-            # TOCHECK : Done picking if all moves are done
-            cr.execute("""
-                SELECT move.id FROM stock_picking pick
-                RIGHT JOIN stock_move move ON move.picking_id = pick.id AND move.state = %s
-                WHERE pick.id = %s""",
-                        ('done', move.picking_id.id))
-            res = cr.fetchall()
-            if len(res) == len(move.picking_id.move_lines):
-                picking_obj.action_move(cr, uid, [move.picking_id.id])
-                wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
+            if  move.picking_id.id :
+                # TOCHECK : Done picking if all moves are done
+                cr.execute("""
+                    SELECT move.id FROM stock_picking pick
+                    RIGHT JOIN stock_move move ON move.picking_id = pick.id AND move.state = %s
+                    WHERE pick.id = %s""",
+                            ('done', move.picking_id.id))
+                res = cr.fetchall()
+                if len(res) == len(move.picking_id.move_lines):
+                    picking_obj.action_move(cr, uid, [move.picking_id.id])
+                    wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
 
         ref = {}
         done_move_ids = []
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 417eaa7694e..3084e8527a7 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,6 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
-        <report id="report_packing_list" model="stock.picking" name="stock.packing.list2" string="Packing list" rml="stock/report/packing.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 699a11a7a4b..7cdcec6e281 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -213,7 +213,8 @@
                     <newline/>
                     <field name="author_id" readonly="1"/>
                     <newline/>
-                    <field name="description"/>
+					<separator string="Description" colspan="4"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -550,13 +551,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Entry Lines">
+                	<group height="200" width="500">
                     <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
                     <field name="picking_id" invisible="True"/>
-                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
+                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"  height="100" width="500"/><newline/>
                     <group colspan="4">
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="action_move" string="Add" type="object" icon="gtk-add"/>
                     </group>
+                    </group>
                 </form>
                </field>
         </record>
@@ -623,7 +626,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:scraped == True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped == True" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -794,7 +797,7 @@
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scraped == True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped == True" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -997,7 +1000,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scraped=True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped==True" string="Stock Moves">
                                     <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"/>
@@ -1197,7 +1200,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
-                                <tree colors="grey:scraped==True" string="Stock Moves" editable="top">
+                                <tree colors="grey:scraped==True" string="Stock Moves">
                                     <field name="product_id" readonly="1"/>
                                     <field name="product_qty" readonly="1"/>
                                     <field name="product_uom" string="UOM" readonly="1"/>
@@ -1262,12 +1265,9 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                 <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
@@ -1362,7 +1362,6 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 5d0d9d0731e..3b9db02ce1f 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -41,7 +41,7 @@
             <field name="name">cancel</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
-            <field name="action">action_cancel_inventary()</field>
+            <field name="action">action_cancel()</field>
         </record>
         
         <record id="act_cancel" model="workflow.activity">
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 38ecddffb91..33b3350d628 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -170,7 +170,7 @@
     country_id: base.in
     partner_id: stock.res_partner_diasorinltd0
     street: Ash House, Ash Road
-    title: Ms.
+    title: base.res_partner_title_miss
     
                
 -     
@@ -270,8 +270,7 @@
       - name: '00001'
         quantity: 5      
     product_id: stock.product_product_hpcdwriters0
-    
-    
+     
 - 
   I Split into production line.
 - 
@@ -327,7 +326,6 @@
       "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
       ref("stock.menu_action_picking_tree6"), })
     
-    
 -
   I confirm the picking.
 -  
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index e8af34c0c71..5ae2987b59a 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -7,11 +7,14 @@
 		        <field name="model">stock.inventory.merge</field>
 		        <field name="type">form</field>
 		        <field name="arch" type="xml">
-		              <form string="Merge inventories">
-				    <separator colspan="4" string="Merge inventories" />
-				    <label string="Do you want to merge theses inventories ?"/>
-				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
+					<form string="Merge inventories">
+				    	<separator colspan="4" string="Merge inventories" />
+				    	<label string="Do you want to merge theses inventories ?"/>
+				 <separator colspan="4"/>
+    				<group colspan="4" col="6">
+					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
+					</group>			
 				</form>
 			</field>
 		</record>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 194f11dc9b4..e50266706d5 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -176,15 +176,16 @@ class split_in_production_lot(osv.osv_memory):
         """
 
         res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})
-        if 'product_uom' in fields:
-            res.update({'product_uom': move.product_uom.id})
-        if 'qty' in fields:
-            res.update({'qty': move.product_qty})
-        if 'use_exist' in fields:
-            res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
+        if context.get('active_id'):
+            move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+            if 'product_id' in fields:
+                res.update({'product_id': move.product_id.id})
+            if 'product_uom' in fields:
+                res.update({'product_uom': move.product_uom.id})
+            if 'qty' in fields:
+                res.update({'qty': move.product_qty})
+            if 'use_exist' in fields:
+                res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
         return res
 
     _columns = {
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index d181e9eb205..980a1b5f402 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -99,11 +99,12 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-                <field name="name">Split in lots</field>
-                <field name="model">stock.move.split</field>
-                <field name="type">form</field>
-                <field name="arch" type="xml">
-              <form string="Split in lots">
+	            <field name="name">Split in lots</field>
+	            <field name="model">stock.move.split</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+				<form string="Split in lots">
+				<group width="660" height="275">
                   <field name="product_id" colspan="4" readonly="1"/>
                   <newline/>
                   <group colspan="4" col="4">
@@ -142,24 +143,25 @@
                             </form>
                         </field>
                     </group>
-                        <separator string="" colspan="4" />
-                        <label string="" colspan="2" />
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="split_lot" string="Ok"
-                            type="object" icon="gtk-ok" />
-                    </form>
-                </field>
-            </record>
+	                	<separator string="" colspan="4" />
+	                	<label string="" colspan="2" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="split_lot" string="Ok"
+	                		type="object" icon="gtk-ok" />
+					</group>
+	                </form>
+	            </field>
+	        </record>
 
-            <record id="track_line" model="ir.actions.act_window">
-                <field name="name">Split in lots</field>
-                <field name="type">ir.actions.act_window</field>
-                <field name="res_model">stock.move.split</field>
-                <field name="view_type">form</field>
-                <field name="view_mode">form</field>
-                <field name="target">new</field>
-            </record>
+	        <record id="track_line" model="ir.actions.act_window">
+	            <field name="name">Split in lots</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">stock.move.split</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
 
-    </data>
+	</data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 24b076f2352..67dd232c168 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -44,7 +44,9 @@ class stock_partial_move(osv.osv_memory):
         moveids = []
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
-                continue
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delivery products  which are already delivered !'))
+
+
             if 'move%s_product_id'%(m.id) not in self._columns:
                 self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
             if 'move%s_product_qty'%(m.id) not in self._columns:
@@ -64,9 +66,10 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         move_ids = context.get('active_ids', False)
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
-        _moves_arch_lst = """<form string="Process Products">
-                        <separator colspan="4" string="Information"/>
-                        <field name="date" colspan="4" />
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                    	<field name="date"  />
+                    	<separator colspan="4"/>
                      <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
                         <field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
                         <field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 0a42a42df29..4083785a8d1 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -61,8 +61,9 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         picking_ids = context.get('active_ids', False)
         _moves_arch_lst = """<form string="Deliver Products">
-                        <separator colspan="4" string="General Information"/>
-                        <field name="date" colspan="4" />
+                        <separator colspan="4" string="Delivery Information"/>
+                    	<field name="date" />
+                    	<separator colspan="4"/>
                         <separator colspan="4" string="Move Detail"/>
                         """
         _moves_fields = result['fields']
diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index 7a3970f9f44..08f3f214ba0 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import stock
+import stock_location
 import mrp_pull
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 8c58fcc2c13..96e5bfe41ba 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -39,7 +39,7 @@ This module may be useful for different purposes:
     'author': 'Tiny',
     'depends': ['procurement','stock'],
     'init_xml': [],
-    'update_xml': ['stock_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
+    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
     'demo_xml': [],
     'installable': True,
     'test':[
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index a8a5026bf4c..b4a68ca1b74 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -32,7 +32,7 @@ class procurement_order(osv.osv):
     def check_buy(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
-                print line.location_src_id.name, line.location_id.name, line.type_proc
+                
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='buy'
         return super(procurement_order, self).check_buy(cr, uid, ids)
@@ -58,7 +58,6 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         location_obj = self.pool.get('stock.location')
         wf_service = netsvc.LocalService("workflow")
-
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
             for line in proc.product_id.flow_pull_ids:
@@ -79,7 +78,7 @@ class procurement_order(osv.osv):
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id':  line.company_id and line.company_id.id or False,
                 'product_id': proc.product_id.id,
                 'date_planned': proc.date_planned,
                 'product_qty': proc.product_qty,
@@ -104,7 +103,7 @@ class procurement_order(osv.osv):
             proc_id = self.pool.get('procurement.order').create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id':  line.company_id and line.company_id.id or False,
                 'date_planned': proc.date_planned,
                 'product_id': proc.product_id.id,
                 'product_qty': proc.product_qty,
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock_location.py
similarity index 95%
rename from addons/stock_location/stock.py
rename to addons/stock_location/stock_location.py
index 561cdbbecda..5404946e3ee 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock_location.py
@@ -80,18 +80,19 @@ class product_pulled_flow(osv.osv):
             required=True,),
     }
     _defaults = {
-        'cancel_cascade': lambda *arg: False,
-        'procure_method': lambda *args: 'make_to_stock',
-        'type_proc': lambda *args: 'move',
-        'picking_type':lambda *args:'out',
-        'invoice_state': lambda *args: 'none',
+        'cancel_cascade': False,
+        'procure_method': 'make_to_stock',
+        'type_proc': 'move',
+        'picking_type': 'out',
+        'invoice_state': 'none',
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.pulled.flow', context=c),
     }
 product_pulled_flow()
 
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
-        'flow_pull_ids': fields.one2many('product.pulled.flow', 'product_id', 'Pulled Flows'),        
+        'flow_pull_ids': fields.one2many('product.pulled.flow', 'product_id', 'Pulled Flows'),
         'path_ids': fields.one2many('stock.location.path', 'product_id',
             'Pushed Flow',
             help="These rules set the right path of the product in the "\
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_location_view.xml
similarity index 100%
rename from addons/stock_location/stock_view.xml
rename to addons/stock_location/stock_location_view.xml
diff --git a/addons/stock_no_autopicking/stock_no_autopicking.py b/addons/stock_no_autopicking/stock_no_autopicking.py
index e0bf3cffec2..17d16328d20 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking.py
+++ b/addons/stock_no_autopicking/stock_no_autopicking.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/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@ class product(osv.osv):
         'auto_pick': fields.boolean('Auto Picking', help="Auto picking for raw materials of production orders.")
     }
     _defaults = {
-        'auto_pick': lambda *args: True
+        'auto_pick': True
     }
 product()
 
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index b0ee2853b87..a174dbb5e41 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,7 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_period_create_lines","stock.period.createlines","model_stock_period_createlines","stock.group_stock_user",1,1,1,1
 "access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,1,1,1
-"access_stock_sale_forecast_createlines","stock.sale.forecast.createlines","model_stock_sale_forecast_createlines","stock.group_stock_user",1,1,1,1
 "access_stock_sale_forecast","stock.sale.forecast","model_stock_sale_forecast","stock.group_stock_user",1,1,1,1
-"access_stock_planning_createlines","stock.planning.createlines","model_stock_planning_createlines","stock.group_stock_user",1,1,1,1
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 0c957d8b72e..bdfcc9991a2 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -20,30 +20,29 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import pooler
-from tools import config
 import time
-import netsvc
-import math
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+
+from osv import osv, fields
+import netsvc
 from tools.translate import _
+from tools import config
+
 
 def rounding(fl, round_value):
     if not round_value:
         return fl
     return round(fl / round_value) * round_value
 
-
 # Object creating periods quickly
 # changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period
 class stock_period_createlines(osv.osv_memory):
     _name = "stock.period.createlines"
 
-    def _get_new_period_start(self,cr,uid,context={}):
+    def _get_new_period_start(self, cr, uid, context=None):
         cr.execute("select max(date_stop) from stock_period")
-        result=cr.fetchone()
+        result = cr.fetchone()
         last_date = result and result[0] or False
         if last_date:
             period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1)
@@ -51,7 +50,7 @@ class stock_period_createlines(osv.osv_memory):
         else:
             period_start = mx.DateTime.today()
         return period_start.strftime('%Y-%m-%d')
-   
+
 
     _columns = {
         'name': fields.char('Period Name', size=64),
@@ -60,47 +59,47 @@ class stock_period_createlines(osv.osv_memory):
         'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
     }
     _defaults={
-        'date_start':_get_new_period_start,
+        'date_start': _get_new_period_start,
     }
-    
-    def create_period_weekly(self,cr, uid, ids, context={}):
-        res=self.create_period(cr, uid, ids, context, 6, 'Weekly')
+
+    def create_period_weekly(self, cr, uid, ids, context=None):
+        res = self.create_period(cr, uid, ids, context, 6, 'Weekly')
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window',
             }
-    
-    def create_period_monthly(self,cr, uid, ids, context={},interval=1):
-        for p in self.browse(cr, uid, ids, context):
+
+    def create_period_monthly(self,cr, uid, ids, interval=1, context=None):
+        for p in self.browse(cr, uid, ids, context=context):
             dt = p.date_start
             ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d')<p.date_stop:
+            while ds.strftime('%Y-%m-%d') < p.date_stop:
                 de = ds + RelativeDateTime(months=interval, minutes=-1)
                 self.pool.get('stock.period').create(cr, uid, {
                     'name': ds.strftime('%Y/%m'),
                     'date_start': ds.strftime('%Y-%m-%d'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),                    
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
                 })
                 ds = ds + RelativeDateTime(months=interval)
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',                
-            }
+                'type': 'ir.actions.act_window',
+                }
 
-    def create_period(self,cr, uid, ids, context={}, interval=0, name='Daily'):
-        for p in self.browse(cr, uid, ids, context):
+    def create_period(self, cr, uid, ids, interval=0, name='Daily', context=None):
+        for p in self.browse(cr, uid, ids, context=context):
             dt = p.date_start
-            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')            
-            while ds.strftime('%Y-%m-%d')<p.date_stop:
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
+            while ds.strftime('%Y-%m-%d') < p.date_stop:
                 de = ds + RelativeDateTime(days=interval, minutes =-1)
-                if name=='Daily':
+                if name =='Daily':
                     new_name=de.strftime('%Y-%m-%d')
-                if name=="Weekly":
-                    new_name=de.strftime('%Y, week %W')
+                if name =="Weekly":
+                    new_name = de.strftime('%Y, week %W')
                 self.pool.get('stock.period').create(cr, uid, {
                     'name': new_name,
                     'date_start': ds.strftime('%Y-%m-%d'),
@@ -111,7 +110,7 @@ class stock_period_createlines(osv.osv_memory):
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.period',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window',
             }
 stock_period_createlines()
 
@@ -119,29 +118,32 @@ stock_period_createlines()
 # If somone thinks different it can be improved.
 class stock_period(osv.osv):
     _name = "stock.period"
+    _description = "stock period"
     _columns = {
-        'name': fields.char('Period Name', size=64),
+        'name': fields.char('Period Name', size=64, required=True),
         'date_start': fields.datetime('Start Date', required=True),
-        'date_stop': fields.datetime('End Date', required=True),        
-        'state' : fields.selection([('draft','Draft'),('open','Open'),('close','Close')],'State')
+        'date_stop': fields.datetime('End Date', required=True),
+        'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State')
     }
     _defaults = {
-        'state' : lambda * a : 'draft'
+        'state': 'draft'
     }
+
 stock_period()
 
 # Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
 # Object added by contributor in ver 1.1
 class stock_sale_forecast_createlines(osv.osv_memory):
     _name = "stock.sale.forecast.createlines"
+    _description = "stock.sale.forecast.createlines"
 
 # FIXME Add some period sugestion like below
 
 #    def _get_latest_period(self,cr,uid,context={}):
 #        cr.execute("select max(date_stop) from stock_period")
-#        result=cr.fetchone()        
+#        result=cr.fetchone()
 #        return result and result[0] or False
-   
+
 
     _columns = {
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
@@ -151,25 +153,25 @@ class stock_sale_forecast_createlines(osv.osv_memory):
         'period_id1': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which forecasts will concern.' ),
         'product_categ_id1': fields.many2one('product.category' , 'Product Category', required=True, \
                                 help ='Product Category of products which created forecasts will concern.'),
-        'copy_forecast' : fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
+        'copy_forecast': fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
+                }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
     }
 
-    _defaults = { 
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
-    }
-
-    def create_forecast(self,cr, uid, ids, context={}):
+    def create_forecast(self, cr, uid, ids, context=None):
         product_obj = self.pool.get('product.product')
-        forecast_obj=self.pool.get('stock.sale.forecast')
-        mod_obj =self.pool.get('ir.model.data')
-        for f in self.browse(cr, uid, ids, context):
-            prod_categ_obj=self.pool.get('product.category')
-            template_obj=self.pool.get('product.template')
+        forecast_obj = self.pool.get('stock.sale.forecast')
+        mod_obj = self.pool.get('ir.model.data')
+        prod_categ_obj = self.pool.get('product.category')
+        template_obj = self.pool.get('product.template')
+        for f in self.browse(cr, uid, ids, context=context):
             categ_ids =  f.product_categ_id1.id and [f.product_categ_id1.id] or []
-            prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
-            templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
-            products_ids = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
-            if len(products_ids)==0:
+            prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
+            templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
+            products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
+            if len(products_ids) == 0:
                 raise osv.except_osv(_('Error !'), _('No products in selected category !'))
             copy = f.copy_forecast
             for p in product_obj.browse(cr, uid, products_ids,{}):
@@ -181,7 +183,7 @@ class stock_sale_forecast_createlines(osv.osv_memory):
 # Not sure if it is expected quantity for this feature (copying forecast from previous period)
 # because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast).
 # It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it.
-                    
+
                     prod_uom = False
                     if copy:
                         cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \
@@ -193,35 +195,37 @@ class stock_sale_forecast_createlines(osv.osv_memory):
                                         AND period.date_stop < %s \
                                     ORDER BY period.date_stop DESC",
                                     (uid, uid, uid, f.warehouse_id1.id, p.id, f.period_id1.date_stop) )
-                        ret=cr.fetchone()
+                        ret = cr.fetchone()
                         if ret:
-                            forecast_qty = ret[1]        
+                            forecast_qty = ret[1]
                             prod_uom = ret[2]
                     prod_uom = prod_uom or p.uom_id.id
                     prod_uos_categ = False
                     if p.uos_id:
                         prod_uos_categ = p.uos_id.category_id.id
                     forecast_obj.create(cr, uid, {
-                        'company_id'  : f.warehouse_id1.company_id.id,
+                        'company_id': f.warehouse_id1.company_id.id,
                         'period_id': f.period_id1.id,
                         'warehouse_id': f.warehouse_id1.id,
                         'product_id': p.id,
-                        'product_qty' : forecast_qty,
-                        'product_amt' : 0.0,
-                        'product_uom' : prod_uom,
-                        'active_uom' : prod_uom,
-                        'product_uom_categ' : p.uom_id.category_id.id,
-                        'product_uos_categ' : prod_uos_categ,
+                        'product_qty': forecast_qty,
+                        'product_amt': 0.0,
+                        'product_uom': prod_uom,
+                        'active_uom': prod_uom,
+                        'product_uom_categ': p.uom_id.category_id.id,
+                        'product_uos_categ': prod_uos_categ,
                      })
         result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.sale.forecast',
                 'type': 'ir.actions.act_window',
-                'search_view_id': id['res_id'],                
+                'search_view_id': id['res_id'],
             }
+
 stock_sale_forecast_createlines()
 
 
@@ -229,76 +233,76 @@ stock_sale_forecast_createlines()
 # A lot of changes in 1.1
 class stock_sale_forecast(osv.osv):
     _name = "stock.sale.forecast"
-    
+
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'create_uid':  fields.many2one('res.users', 'Responsible'),
-        'name' : fields.char('Name', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'create_uid': fields.many2one('res.users', 'Responsible'),
+        'name': fields.char('Name', size=64, readonly=True, states={'draft': [('readonly',False)]}),
         'user_id': fields.many2one('res.users' , 'Created/Validated by',readonly=True, \
                                         help='Shows who created this forecast, or who validated.'),
-        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, readonly=True, states={'draft': [('readonly',False)]}, \
                                         help='Shows which warehouse this forecast concerns. '\
                                          'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
         'period_id': fields.many2one('stock.period' , 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
                                         help = 'Shows which period this forecast concerns.'),
         'product_id': fields.many2one('product.product' , 'Product', readonly=True, required=True, states={'draft':[('readonly',False)]}, \
                                         help = 'Shows which product this forecast concerns.'),
-        'product_qty' : fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+        'product_qty': fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
                                         help= 'Forecasted quantity.'),
-        'product_amt' : fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}, \
+        'product_amt': fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}, \
                                         help='Forecast value which will be converted to Product Quantity according to prices.'),
-        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'),  # Invisible field for product_uom domain
-        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+        'product_uom_categ': fields.many2one('product.uom.categ', 'Product UoM Category'),  # Invisible field for product_uom domain
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
                         help = "Unit of Measure used to show the quanities of stock calculation." \
                         "You can use units form default category or from second category (UoS category)."),
         'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain
 # Field used in onchange_uom to check what uom was before change and recalculate quantities acording to old uom (active_uom) and new uom.
-        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"),  
-        'state' : fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
-        'analyzed_period1_id' : fields.many2one('stock.period' , 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period2_id' : fields.many2one('stock.period' , 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period3_id' : fields.many2one('stock.period' , 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period4_id' : fields.many2one('stock.period' , 'Period4', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period5_id' : fields.many2one('stock.period' , 'Period5', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_user_id' : fields.many2one('res.users' , 'This User', required=False, readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_dept_id' : fields.many2one('hr.department' , 'This Department', required=False, \
+        'active_uom': fields.many2one('product.uom',  string = "Active UoM"),
+        'state': fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
+        'analyzed_period1_id': fields.many2one('stock.period' , 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period2_id': fields.many2one('stock.period' , 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period3_id': fields.many2one('stock.period' , 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period4_id': fields.many2one('stock.period' , 'Period4', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period5_id': fields.many2one('stock.period' , 'Period5', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_user_id': fields.many2one('res.users' , 'This User', required=False, readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_dept_id': fields.many2one('hr.department' , 'This Department', required=False, \
                                     readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_warehouse_id' : fields.many2one('stock.warehouse' , 'This Warehouse', required=False, \
+        'analyzed_warehouse_id': fields.many2one('stock.warehouse' , 'This Warehouse', required=False, \
                                     readonly=True, states={'draft':[('readonly',False)]}),
-        'analyze_company' : fields.boolean('Per Company', readonly=True, states={'draft':[('readonly',False)]}, \
+        'analyze_company': fields.boolean('Per Company', readonly=True, states={'draft':[('readonly',False)]}, \
                                     help = "Check this box to see the sales for whole company."),
-        'analyzed_period1_per_user' : fields.float('This User Period1', readonly=True),
-        'analyzed_period2_per_user' : fields.float('This User Period2', readonly=True),
-        'analyzed_period3_per_user' : fields.float('This User Period3', readonly=True),
-        'analyzed_period4_per_user' : fields.float('This User Period4', readonly=True),
-        'analyzed_period5_per_user' : fields.float('This User Period5', readonly=True),
-        'analyzed_period1_per_dept' : fields.float('This Dept Period1', readonly=True),
-        'analyzed_period2_per_dept' : fields.float('This Dept Period2', readonly=True),
-        'analyzed_period3_per_dept' : fields.float('This Dept Period3', readonly=True),
-        'analyzed_period4_per_dept' : fields.float('This Dept Period4', readonly=True),
-        'analyzed_period5_per_dept' : fields.float('This Dept Period5', readonly=True),
-        'analyzed_period1_per_warehouse' : fields.float('This Warehouse Period1', readonly=True),
-        'analyzed_period2_per_warehouse' : fields.float('This Warehouse Period2', readonly=True),
-        'analyzed_period3_per_warehouse' : fields.float('This Warehouse Period3', readonly=True),
-        'analyzed_period4_per_warehouse' : fields.float('This Warehouse Period4', readonly=True),
-        'analyzed_period5_per_warehouse' : fields.float('This Warehouse Period5', readonly=True),
-        'analyzed_period1_per_company' : fields.float('This Copmany Period1', readonly=True),
-        'analyzed_period2_per_company' : fields.float('This Company Period2', readonly=True),
-        'analyzed_period3_per_company' : fields.float('This Company Period3', readonly=True),
-        'analyzed_period4_per_company' : fields.float('This Company Period4', readonly=True),
-        'analyzed_period5_per_company' : fields.float('This Company Period5', readonly=True),
+        'analyzed_period1_per_user': fields.float('This User Period1', readonly=True),
+        'analyzed_period2_per_user': fields.float('This User Period2', readonly=True),
+        'analyzed_period3_per_user': fields.float('This User Period3', readonly=True),
+        'analyzed_period4_per_user': fields.float('This User Period4', readonly=True),
+        'analyzed_period5_per_user': fields.float('This User Period5', readonly=True),
+        'analyzed_period1_per_dept': fields.float('This Dept Period1', readonly=True),
+        'analyzed_period2_per_dept': fields.float('This Dept Period2', readonly=True),
+        'analyzed_period3_per_dept': fields.float('This Dept Period3', readonly=True),
+        'analyzed_period4_per_dept': fields.float('This Dept Period4', readonly=True),
+        'analyzed_period5_per_dept': fields.float('This Dept Period5', readonly=True),
+        'analyzed_period1_per_warehouse': fields.float('This Warehouse Period1', readonly=True),
+        'analyzed_period2_per_warehouse': fields.float('This Warehouse Period2', readonly=True),
+        'analyzed_period3_per_warehouse': fields.float('This Warehouse Period3', readonly=True),
+        'analyzed_period4_per_warehouse': fields.float('This Warehouse Period4', readonly=True),
+        'analyzed_period5_per_warehouse': fields.float('This Warehouse Period5', readonly=True),
+        'analyzed_period1_per_company': fields.float('This Copmany Period1', readonly=True),
+        'analyzed_period2_per_company': fields.float('This Company Period2', readonly=True),
+        'analyzed_period3_per_company': fields.float('This Company Period3', readonly=True),
+        'analyzed_period4_per_company': fields.float('This Company Period4', readonly=True),
+        'analyzed_period5_per_company': fields.float('This Company Period5', readonly=True),
     }
     _defaults = {
         'user_id': lambda obj, cr, uid, context: uid,
-        'state': lambda *args: 'draft',
+        'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast', context=c),
     }
 
     def action_validate(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state':'validated','user_id':uid})
         return True
-    
-    def unlink(self, cr, uid, ids, context={}):
+
+    def unlink(self, cr, uid, ids, context=None):
         forecasts = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
         for t in forecasts:
@@ -309,17 +313,18 @@ class stock_sale_forecast(osv.osv):
         osv.osv.unlink(self, cr, uid, unlink_ids,context=context)
         return True
 
-    def onchange_company(self, cr, uid, ids, company_id):
+    def onchange_company(self, cr, uid, ids, company_id=False):
         result = {}
-        if company_id:
-            result['warehouse_id'] = False
-            result['analyzed_user_id'] = False
-            result['analyzed_dept_id'] = False
-            result['analyzed_warehouse_id'] = False
+        if not company_id:
+            return result
+        result['warehouse_id'] = False
+        result['analyzed_user_id'] = False
+        result['analyzed_dept_id'] = False
+        result['analyzed_warehouse_id'] = False
         return {'value': result}
 
-    def product_id_change(self, cr, uid, ids, product_id):
-        ret={}
+    def product_id_change(self, cr, uid, ids, product_id=False):
+        ret = {}
         if product_id:
             product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
             ret['product_uom'] = product_rec.uom_id.id
@@ -333,30 +338,36 @@ class stock_sale_forecast(osv.osv):
         res = {'value': ret}
         return res
 
-    def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, active_uom=False ):
-        ret={}
-        val1 = self.browse(cr, uid, ids)
-        val = val1[0]
-        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, active_uom, {})
-        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
-        coeff = coeff_uom2def * coeff_def2uom
-        ret['product_qty'] = rounding(coeff * product_qty, round_value)
-        ret['active_uom'] = product_uom
+    def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, active_uom=False):
+        ret = {}
+        if not ids:
+            return {}
+        if product_uom:
+            val1 = self.browse(cr, uid, ids)
+            val = val1[0]
+            coeff_uom2def = self._to_default_uom_factor(cr, uid, val, active_uom, {})
+            coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+            coeff = coeff_uom2def * coeff_def2uom
+            ret['product_qty'] = rounding(coeff * product_qty, round_value)
+            ret['active_uom'] = product_uom
         return {'value': ret}
 
     def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False):
-        ret={}
+        ret = {}
+        if not ids:
+            return {}
+        round_value = 1
         if product_amt:
             coeff_def2uom = 1
             val1 = self.browse(cr, uid, ids)
             val = val1[0]
             if (product_uom != val.product_id.uom_id.id):
-                coeff_def2uom, rounding = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+                coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
             ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value)
         res = {'value': ret}
         return res
 
-    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         coef =  uom.factor
@@ -375,29 +386,29 @@ class stock_sale_forecast(osv.osv):
     def _sales_per_users(self, cr, uid, so, so_line, company, users):
         cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
                    "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s) AND (s.company_id=%s) " \
-                    "AND (s.user_id IN %s) " %(tuple(so_line), tuple(so), company, tuple(users)))
+                    "AND (s.user_id IN %s) " ,(tuple(so_line), tuple(so), company, tuple(users)))
         ret = cr.fetchone()[0] or 0.0
         return ret
 
-    def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops):        
+    def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops):
         cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
                    "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s)AND (s.company_id=%s) " \
-                    "AND (s.shop_id IN %s)" %(tuple(so_line), tuple(so), company, tuple(shops)))
+                    "AND (s.shop_id IN %s)" ,(tuple(so_line), tuple(so), company, tuple(shops)))
         ret = cr.fetchone()[0] or 0.0
         return ret
 
-    def _sales_per_company(self, cr, uid, so, so_line, company, ):
+    def _sales_per_company(self, cr, uid, so, so_line, company):
         cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
-                   "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s) AND (s.company_id=%s)"%(tuple(so_line), tuple(so), company))
+                   "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s) AND (s.company_id=%s)", (tuple(so_line), tuple(so), company))
         ret = cr.fetchone()[0] or 0.0
         return ret
-    
+
     def calculate_sales_history(self, cr, uid, ids, context, *args):
-        sales=[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
-        for obj in  self.browse(cr, uid, ids):
-            periods =obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
+        sales = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
+        for obj in self.browse(cr, uid, ids):
+            periods = obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
             so_obj = self.pool.get('sale.order')
-            so_line_obj= self.pool.get('sale.order.line')
+            so_line_obj = self.pool.get('sale.order.line')
             so_line_product_ids = so_line_obj.search(cr, uid, [('product_id','=', obj.product_id.id)], context = context)
             if so_line_product_ids:
                 so_line_product_set = ','.join(map(str,so_line_product_ids))
@@ -410,8 +421,8 @@ class stock_sale_forecast(osv.osv):
                     dept_obj = self.pool.get('hr.department')
                     dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
                     dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
-                    dept_ids_set = ','.join(map(str,dept_ids))
-                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" %(tuple(dept_ids_set),))
+#                    dept_ids_set = ','.join(map(str,dept_ids))
+                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),))
                     dept_users = [x for x, in cr.fetchall()]
                     dept_users_set =  ','.join(map(str,dept_users))
                 else:
@@ -419,62 +430,63 @@ class stock_sale_forecast(osv.osv):
                 factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context)
                 for i, period in enumerate(periods):
                     if period:
-                        so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start), ('date_order','<=',period.date_stop)], context = context)
+                        so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start),('date_order','<=',period.date_stop) ], context = context)
                         if so_period_ids:
-                            so_period_set = ','.join(map(str,so_period_ids))
+                           # so_period_set = ','.join(map(str,so_period_ids))
                             if obj.analyzed_user_id:
                                 user_set = str(obj.analyzed_user_id.id)
-                                sales[i][0] =self._sales_per_users(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, user_set)
-                                sales[i][0] *=factor
+
+                                sales[i][0] = self._sales_per_users(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, user_set)
+                                sales[i][0] *= factor
                             if dept_users:
-                                sales[i][1]=  self._sales_per_users(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, dept_users_set)
-                                sales[i][1]*=factor
+                                sales[i][1] = self._sales_per_users(cr, uid, so_period_ids,  so_line_product_ids, obj.company_id.id, dept_users_set)
+                                sales[i][1] *= factor
                             if shops:
-                                sales[i][2]= self._sales_per_warehouse(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, shops_set)
-                                sales[i][2]*=factor
+                                sales[i][2] = self._sales_per_warehouse(cr, uid, so_period_ids,  so_line_product_ids, obj.company_id.id, shops_set)
+                                sales[i][2] *= factor
                             if obj.analyze_company:
-                                sales[i][3]= self._sales_per_company(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, )
-                                sales[i][3]*=factor
+                                sales[i][3] = self._sales_per_company(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, )
+                                sales[i][3] *= factor
         self.write(cr, uid, ids, {
-            'analyzed_period1_per_user':sales[0][0],
-            'analyzed_period2_per_user':sales[1][0],
-            'analyzed_period3_per_user':sales[2][0],
-            'analyzed_period4_per_user':sales[3][0],
-            'analyzed_period5_per_user':sales[4][0],
-            'analyzed_period1_per_dept':sales[0][1],
-            'analyzed_period2_per_dept':sales[1][1],
-            'analyzed_period3_per_dept':sales[2][1],
-            'analyzed_period4_per_dept':sales[3][1],
-            'analyzed_period5_per_dept':sales[4][1],
-            'analyzed_period1_per_warehouse':sales[0][2],
-            'analyzed_period2_per_warehouse':sales[1][2],
-            'analyzed_period3_per_warehouse':sales[2][2],
-            'analyzed_period4_per_warehouse':sales[3][2],
-            'analyzed_period5_per_warehouse':sales[4][2],
-            'analyzed_period1_per_company':sales[0][3],
-            'analyzed_period2_per_company':sales[1][3],
-            'analyzed_period3_per_company':sales[2][3],
-            'analyzed_period4_per_company':sales[3][3],
-            'analyzed_period5_per_company':sales[4][3],
+            'analyzed_period1_per_user': sales[0][0],
+            'analyzed_period2_per_user': sales[1][0],
+            'analyzed_period3_per_user': sales[2][0],
+            'analyzed_period4_per_user': sales[3][0],
+            'analyzed_period5_per_user': sales[4][0],
+            'analyzed_period1_per_dept': sales[0][1],
+            'analyzed_period2_per_dept': sales[1][1],
+            'analyzed_period3_per_dept': sales[2][1],
+            'analyzed_period4_per_dept': sales[3][1],
+            'analyzed_period5_per_dept': sales[4][1],
+            'analyzed_period1_per_warehouse': sales[0][2],
+            'analyzed_period2_per_warehouse': sales[1][2],
+            'analyzed_period3_per_warehouse': sales[2][2],
+            'analyzed_period4_per_warehouse': sales[3][2],
+            'analyzed_period5_per_warehouse': sales[4][2],
+            'analyzed_period1_per_company': sales[0][3],
+            'analyzed_period2_per_company': sales[1][3],
+            'analyzed_period3_per_company': sales[2][3],
+            'analyzed_period4_per_company': sales[3][3],
+            'analyzed_period5_per_company': sales[4][3],
         })
         return True
 
 
 stock_sale_forecast()
 
-# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period' 
-# Object added by contributor in ver 1.1 
+# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period'
+# Object added by contributor in ver 1.1
 class stock_planning_createlines(osv.osv_memory):
     _name = "stock.planning.createlines"
 
-    def onchange_company(self, cr, uid, ids, company_id):
+    def onchange_company(self, cr, uid, ids, company_id=False):
         result = {}
         if company_id:
             result['warehouse_id2'] = False
         return {'value': result}
 
     _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required = True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'period_id2': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'),
         'warehouse_id2': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'),
         'product_categ_id2': fields.many2one('product.category' , 'Product Category', \
@@ -486,13 +498,15 @@ class stock_planning_createlines(osv.osv_memory):
     }
 
     _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
     }
 
-    def create_planning(self,cr, uid, ids, context={}):
+    def create_planning(self,cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         product_obj = self.pool.get('product.product')
-        planning_obj=self.pool.get('stock.planning')
-        mod_obj =self.pool.get('ir.model.data')
+        planning_obj = self.pool.get('stock.planning')
+        mod_obj = self.pool.get('ir.model.data')
         for f in self.browse(cr, uid, ids, context=context):
             if f.forecasted_products:
                 cr.execute("SELECT product_id \
@@ -500,11 +514,11 @@ class stock_planning_createlines(osv.osv_memory):
                                 WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id))
                 products_id1 = [x for x, in cr.fetchall()]
             else:
-                prod_categ_obj=self.pool.get('product.category')
-                template_obj=self.pool.get('product.template')
-                categ_ids =  f.product_categ_id2.id and [f.product_categ_id2.id] or []
-                prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
-                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
+                prod_categ_obj = self.pool.get('product.category')
+                template_obj = self.pool.get('product.template')
+                categ_ids = f.product_categ_id2.id and [f.product_categ_id2.id] or []
+                prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
+                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
                 products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
             if len(products_id1)==0:
                 raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
@@ -529,7 +543,7 @@ class stock_planning_createlines(osv.osv_memory):
                     if ret:
 #                            raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
                         prod_uom = ret[1]
-                        planned_out = ret[2]        
+                        planned_out = ret[2]
                         to_procure = ret[3]
                         stock_only = ret[4]
                         procure_to_stock = ret[5]
@@ -538,7 +552,7 @@ class stock_planning_createlines(osv.osv_memory):
                         stock_supply_location = ret[8]
                     else:
                         prod_uom = p.uom_id.id
-                        planned_out = False        
+                        planned_out = False
                         to_procure = False
                         stock_only = False
                         procure_to_stock = False
@@ -557,7 +571,7 @@ class stock_planning_createlines(osv.osv_memory):
                         'product_uom_categ' : p.uom_id.category_id.id,
                         'product_uos_categ' : prod_uos_categ,
                         'active_uom' : prod_uom,
-                        'planned_outgoing': planned_out,       
+                        'planned_outgoing': planned_out,
                         'to_procure': to_procure,
                         'stock_only': stock_only,
                         'procure_to_stock': procure_to_stock,
@@ -572,8 +586,8 @@ class stock_planning_createlines(osv.osv_memory):
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.planning',
-                'type': 'ir.actions.act_window', 
-                'search_view_id': id['res_id'],               
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id'],
             }
 stock_planning_createlines()
 
@@ -582,11 +596,12 @@ stock_planning_createlines()
 # A lot of changes by contributor in ver 1.1
 class stock_planning(osv.osv):
     _name = "stock.planning"
-    
-    def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context):
+
+    def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context=None):
 #        res = {}
-#        if not context:
-#            context = {}
+        if not context:
+            context = {}
+        product_obj = self.pool.get('product.product')
         mapping = {'in': {
                         'field': "incoming_qty",
                         'adapter': lambda x: x,
@@ -603,22 +618,21 @@ class stock_planning(osv.osv):
             locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
         context['location'] = locations
         context['compute_child'] = True
-        product_obj =  self.pool.get('product.product')
         prod_id = val.product_id.id
         if done:
-            c1=context.copy()
+            c1 = context.copy()
             c1.update({ 'states':('done',), 'what':(direction,) })
             prod_ids = [prod_id]
             st = product_obj.get_product_available(cr,uid, prod_ids, context=c1)
             res = mapping[direction]['adapter'](st.get(prod_id,0.0))
         else:
-            product=product_obj.read(cr, uid, prod_id,[], context)
+            product = product_obj.read(cr, uid, prod_id,[], context)
             product_qty = product[mapping[direction]['field']]
             res = mapping[direction]['adapter'](product_qty)
 #            res[val.id] = product_obj['incoming_qty']
         return res
 
-    def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context):
+    def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context=None):
         cr.execute("SELECT sum(planning.planned_outgoing), planning.product_uom \
                     FROM stock_planning AS planning \
                     LEFT JOIN stock_period AS period \
@@ -641,12 +655,12 @@ class stock_planning(osv.osv):
                 coef = coef * res_coef
                 res_qty += rounding(qty * coef, round_value)
         return res_qty
-        
 
-    def _get_forecast(self, cr, uid, ids, field_names, arg, context):
+
+    def _get_forecast(self, cr, uid, ids, field_names, arg, context=None):
         res = {}
         for val in self.browse(cr, uid, ids):
-            res[val.id]={}
+            res[val.id] = {}
             valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or ""
             cr.execute('SELECT sum(product_qty), product_uom  \
                         FROM stock_sale_forecast \
@@ -666,7 +680,7 @@ class stock_planning(osv.osv):
             res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'],  val.product_id.uom_id.rounding)
         return res
 
-    def _get_stock_start(self, cr, uid, val, date, context):
+    def _get_stock_start(self, cr, uid, val, date, context=None):
         context['from_date'] = None
         context['to_date'] = date
         locations = [val.warehouse_id.lot_stock_id.id,]
@@ -677,7 +691,7 @@ class stock_planning(osv.osv):
         product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
         res = product_obj['qty_available']     # value for stock_start
         return res
-    
+
     def _get_past_future(self, cr, uid, ids, field_names, arg, context):
         res = {}
         for val in self.browse(cr, uid, ids, context=context):
@@ -687,14 +701,14 @@ class stock_planning(osv.osv):
                 res[val.id] = 'Future'
         return res
 
-    def _get_op(self, cr, uid, ids, field_names, arg, context):  # op = OrderPoint
+    def _get_op(self, cr, uid, ids, field_names, arg, context=None):  # op = OrderPoint
         res = {}
         for val in self.browse(cr, uid, ids, context=context):
             res[val.id]={}
             cr.execute("SELECT product_min_qty, product_max_qty, product_uom  \
                         FROM stock_warehouse_orderpoint \
                         WHERE warehouse_id = %s AND product_id = %s AND active = 'TRUE'", (val.warehouse_id.id, val.product_id.id))
-            ret =  cr.fetchone() or [0.0,0.0,False]
+            ret = cr.fetchone() or [0.0,0.0,False]
             coef = 1
             round_value = 1
             if ret[2]:
@@ -704,42 +718,45 @@ class stock_planning(osv.osv):
             res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value)
             res[val.id]['maximum_op'] = ret[1]*coef
         return res
-    
-    def onchange_company(self, cr, uid, ids, company_id):
+
+    def onchange_company(self, cr, uid, ids, company_id=False):
         result = {}
         if company_id:
             result['warehouse_id'] = False
         return {'value': result}
 
-    def onchange_uom(self, cr, uid, ids, product_uom, ):
+    def onchange_uom(self, cr, uid, ids, product_uom=False):
+        ret = {}
         if not product_uom:
             return {}
-        ret={}
+        if not ids:
+            return {}
         val1 = self.browse(cr, uid, ids)
         val = val1[0]
-        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {})
-        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
-        coeff = coeff_uom2def * coeff_def2uom
-        ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value)
-        ret['to_procure'] = rounding(coeff * val.to_procure, round_value)
+        if val.active_uom:
+            coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {})
+            coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+            coeff = coeff_uom2def * coeff_def2uom
+            ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value)
+            ret['to_procure'] = rounding(coeff * val.to_procure, round_value)
         ret['active_uom'] = product_uom
         return {'value': ret}
 
     _columns = {
         'company_id': fields.many2one('res.company', 'Company', required = True),
-        'history' : fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
+        'history': fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
         'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True),
         'period_id': fields.many2one('stock.period' , 'Period', required=True, \
                 help = 'Period for this planning. Requisition will be created for beginning of the period.'),
-        'warehouse_id' : fields.many2one('stock.warehouse','Warehouse', required=True), 
+        'warehouse_id': fields.many2one('stock.warehouse','Warehouse', required=True),
         'product_id': fields.many2one('product.product' , 'Product', required=True, help = 'Product which this planning is created for.'),
         'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uom domain
-        'product_uom' : fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \
+        'product_uom': fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \
                         "You can use units form default category or from second category (UoS category)."),
-        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uos domain
+        'product_uos_categ': fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uos domain
 # Field used in onchange_uom to check what uom was before change to recalculate quantities acording to old uom (active_uom) and new uom.
-        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"), 
-        'planned_outgoing' : fields.float('Planned Out', required=True,  \
+        'active_uom': fields.many2one('product.uom',  string = "Active UoM"),
+        'planned_outgoing': fields.float('Planned Out', required=True,  \
                 help = '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.'),
         'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \
@@ -763,54 +780,54 @@ class stock_planning(osv.osv):
         'to_procure': fields.float(string='Planned In', required=True, \
                 help = '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.'),
-        'line_time' : fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
-        'minimum_op' : fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
+        'line_time': fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
+        'minimum_op': fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
                             help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'),
-        'maximum_op' : fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
+        'maximum_op': fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
                             help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'),
-        'outgoing_before' : fields.float('Planned Out Before', readonly=True, \
+        'outgoing_before': fields.float('Planned Out Before', readonly=True, \
                             help= 'Planned Out in periods before calculated. '\
                                     'Between start date of current period and one day before start of calculated period.'),
         'incoming_before': fields.float('Incoming Before', readonly = True, \
                             help= 'Confirmed incoming in periods before calculated (Including Already In). '\
                                     'Between start date of current period and one day before start of calculated period.'),
-        'stock_start' : fields.float('Initial Stock', readonly=True, \
+        'stock_start': fields.float('Initial Stock', readonly=True, \
                             help= 'Stock quantity one day before current period.'),
-        'already_out' : fields.float('Already Out', readonly=True, \
+        'already_out': fields.float('Already Out', readonly=True, \
                             help= 'Quantity which is already dispatched out of this warehouse in current period.'),
-        'already_in' : fields.float('Already In', readonly=True, \
+        'already_in': fields.float('Already In', readonly=True, \
                             help= 'Quantity which is already picked up to this warehouse in current period.'),
-        'stock_only' : fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \
+        'stock_only': fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \
                                         "If not selected calculation is made for input, stock and output location of warehouse."),
-        "procure_to_stock" : fields.boolean("Procure To Stock Location", help = "Chect to make procurement to stock location of selected warehouse. " \
+        "procure_to_stock": fields.boolean("Procure To Stock Location", help = "Chect to make procurement to stock location of selected warehouse. " \
                                         "If not selected procurement will be made into input location of warehouse."),
-        "confirmed_forecasts_only" : fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \
+        "confirmed_forecasts_only": fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \
                     "If not checked system takes validated and draft forecasts."),
-        'supply_warehouse_id' : fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warhouse'."), 
-        "stock_supply_location" : fields.boolean("Stock Supply Location", help = "Check to supply from Stock location of Supply Warehouse. " \
+        'supply_warehouse_id': fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warhouse'."),
+        "stock_supply_location": fields.boolean("Stock Supply Location", help = "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 Warhouse' with Supply Warehouse."),
 
     }
 
     _defaults = {
         'state': lambda *args: 'draft' ,
-        'to_procure' : 0.0,
-        'planned_outgoing' : 0.0,
+        'to_procure': 0.0,
+        'planned_outgoing': 0.0,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
-    }   
-    
+    }
+
     _order = 'period_id'
 
-    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
-        coef =  uom.factor
+        coef = uom.factor
         if uom.category_id.id != val.product_id.uom_id.category_id.id:
             coef = coef / val.product_id.uos_coeff
         return val.product_id.uom_id.factor / coef
 
 
-    def _from_default_uom_factor(self, cr, uid, val, uom_id, context):
+    def _from_default_uom_factor(self, cr, uid, val, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         res = uom.factor
@@ -821,7 +838,7 @@ class stock_planning(osv.osv):
     def calculate_planning(self, cr, uid, ids, context, *args):
         one_minute = RelativeDateTime(minutes=1)
         current_date_beginning_c = mx.DateTime.today()
-        current_date_end_c = current_date_beginning_c  + RelativeDateTime(days=1, minutes=-1)  # to get hour 23:59:00 
+        current_date_end_c = current_date_beginning_c  + RelativeDateTime(days=1, minutes=-1)  # to get hour 23:59:00
         current_date_beginning = current_date_beginning_c.strftime('%Y-%m-%d %H:%M:%S')
         current_date_end = current_date_end_c.strftime('%Y-%m-%d %H:%M:%S')
         for val in self.browse(cr, uid, ids, context=context):
@@ -848,9 +865,9 @@ class stock_planning(osv.osv):
             incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done = False, context=context),
             stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context),
             if start_date_current_period == val.period_id.date_start:   # current period is calculated
-                current=True
+                current = True
             else:
-                current=False
+                current = False
             factor, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
             self.write(cr, uid, ids, {
                 'already_out': rounding(already_out[0]*factor,round_value),
@@ -861,16 +878,16 @@ class stock_planning(osv.osv):
                 'incoming_before': rounding((incoming_before[0]+ (not current and already_in[0]))*factor,round_value),
                 'outgoing_left': rounding(val.planned_outgoing - (outgoing[0] + (current and already_out[0]))*factor,round_value),
                 'incoming_left': rounding(val.to_procure - (incoming[0] + (current and already_in[0]))*factor,round_value),
-                'stock_start' : rounding(stock_start[0]*factor,round_value),
+                'stock_start': rounding(stock_start[0]*factor,round_value),
                 'stock_simulation': rounding(val.to_procure - val.planned_outgoing + (stock_start[0]+ incoming_before[0] - outgoing_before[0] \
                                      + (not current and already_in[0]))*factor,round_value),
             })
         return True
 
 # method below converts quantities and uoms to general OpenERP standard with UoM Qty, UoM, UoS Qty, UoS.
-# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category) 
+# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category)
 # so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated.
-# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category) 
+# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category)
 # and basic UoM is calculated.
     def _qty_to_standard(self, cr, uid, val, context):
         uos = False
@@ -892,7 +909,7 @@ class stock_planning(osv.osv):
             coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uom, {})
             uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
         return uom_qty, uom, uos_qty, uos
-    
+
     def procure_incomming_left(self, cr, uid, ids, context, *args):
         for obj in self.browse(cr, uid, ids):
             if obj.incoming_left <= 0:
@@ -909,7 +926,7 @@ class stock_planning(osv.osv):
                         'product_uom': uom,
                         'product_uos_qty': uos_qty,
                         'product_uos': uos,
-                        'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id, 
+                        'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id,
                         'procure_method': 'make_to_order',
                         'note' : _("Procurement created in MPS by user: ") + str(user.login) + _("  Creation Date: ") + \
                                             time.strftime('%Y-%m-%d %H:%M:%S') + \
@@ -949,7 +966,7 @@ class stock_planning(osv.osv):
                             'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
                             'type': 'internal',
                             'state': 'auto',
-                            'date' :  obj.period_id.date_start,
+                            'date' : obj.period_id.date_start,
                             'move_type': 'direct',
                             'invoice_state':  'none',
                             'company_id': obj.company_id.id,
@@ -995,9 +1012,9 @@ class stock_planning(osv.osv):
                 })
 
         return True
-   
+
     def product_id_change(self, cr, uid, ids, product_id):
-        ret={}
+        ret = {}
         if product_id:
             product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
             ret['product_uom'] = product_rec.uom_id.id
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index a575f677661..7da194d91e1 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -105,7 +105,7 @@
                     <separator colspan ="4" string="Forecast lines creation"/>
                     <label  colspan ="4" string="Creates forecast lines for selected warehouse and period. Doesn't duplicate existing lines created by you."/>
                     <group colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-cancel"  special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" name="create_forecast" string="Create Forecasts" type="object" />
                     </group>
                 </form>
@@ -113,7 +113,7 @@
         </record>
 
         <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
-            <field name="name">Create Stock and Sales Forecasts</field>
+            <field name="name">Create Sales Forecasts</field>
             <field name="res_model">stock.sale.forecast.createlines</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -121,9 +121,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" 
+        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
                 parent="base.menu_base_partner" sequence="6"/>
-        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
+        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
 
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.form</field>
@@ -152,7 +152,9 @@
                             <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
                             <field name="product_qty"  />
                             <field name="state"/>
-                            <button name="action_validate" string="Validate" states="draft" type="object" colspan = "2"/>
+                            <label string = ""/>
+                            <button name="action_validate" icon="gtk-apply" string="Validate" states="draft" type="object" colspan = "1"/>
+
                 </group>
                     </group>
                     <separator colspan ="4" string="Sales history"/>
@@ -161,7 +163,7 @@
                         <label string = "Per User :"/>
                         <label string = "Per Department :"/>
                         <label string = "Per Warehouse :"/>
-                        <label string = "Per Company :"/>
+                        <label string = ""/>
                         <label string = "Periods :"/>
                         <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
                         <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
@@ -207,13 +209,15 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Stock and Sales Forecasts" editable="bottom">
+                <tree string="Sales Forecasts" editable="bottom">
                     <field name="warehouse_id"/>
+                    <field name ="company_id"/>
                     <field name="user_id"/>
                     <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
                     <field name="product_uom" />
+                    
                 </tree>
             </field>
         </record>
@@ -237,22 +241,28 @@
             <field name="model">stock.sale.forecast</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Stock and Sales Forecast">
-                 <group col='10' colspan='4'>
+                <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" widget="selection"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <field name="company_id"/>
+                    <field name="warehouse_id" />
+                    <field name="period_id" />
                     <field name="product_id"/>
                     <field name="create_uid"/>
-                </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
+                    </group>
               </search>
             </field>
         </record>
 
 
         <record id="action_view_stock_sale_forecast_form" model="ir.actions.act_window">
-            <field name="name">Stock and Sales Forecast</field>
+            <field name="name">Sales Forecast</field>
             <field name="res_model">stock.sale.forecast</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
@@ -261,7 +271,7 @@
         </record>
 
         <menuitem id="menu_stock_sale_forecast_all"
-                  name="Stock and Sales Forecasts"
+                  name="Sales Forecasts"
                   parent="menu_stock_sale_forecast"
                   action="action_view_stock_sale_forecast_form"/>
 
@@ -351,7 +361,7 @@
                             <field name="to_procure"/>
                             <field name="incoming"/>
                             <field name="incoming_left"/>
-                            <button name="calculate_planning" string="Calculate Planning" type="object" colspan="2"/>
+                            <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
                             <field name="stock_only"/>
                         </group>
                         <group colspan ="2" col="2">
@@ -362,10 +372,10 @@
                             <field name="outgoing_before"/>
                             <field name="incoming_before"/>
                             <field name="stock_simulation"/>
-                            <button name="procure_incomming_left" string="Procure Incoming Left" type="object" colspan="2"/>
+                            <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
                             <field name="procure_to_stock"/>
                             <separator colspan ="2" string = "Internal Supply"/>
-                            <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
+                            <button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert"  type="object" colspan="2"/>
                             <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
                             <field name="stock_supply_location"/>
                         </group>
@@ -382,14 +392,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
-                 <group col='10' colspan='4'>
-<!--  Doesn't work !       <filter icon="terp-purchase" string="Current" domain="[('line_time','=','Future')]" separator="1"/>  -->
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
                     <field name="product_id"/>
-                 </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                       <separator orientation="vertical"/>
+                    </group>                 
               </search>
             </field>
         </record>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index b05bf099d09..934f1a42707 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -79,7 +79,8 @@ class subscription_subscription(osv.osv):
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
-        'cron_id': fields.many2one('ir.cron', 'Cron Job')
+        'cron_id': fields.many2one('ir.cron', 'Cron Job'),
+        'note': fields.text('Notes', help="Description or Summary of Subscription"),
     }
     _defaults = {
         'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 695f9b00895..f13565b56a6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -42,6 +42,10 @@
                         <page string="Documents created">
                             <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
                         </page>
+                        <page string="Notes">
+                            <separator string="Notes" colspan="4"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                    </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
new file mode 100644
index 00000000000..3b860411c3b
--- /dev/null
+++ b/addons/survey/i18n/es.po
@@ -0,0 +1,695 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:01+0000\n"
+"PO-Revision-Date: 2010-06-29 22:27+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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: 2010-07-01 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr "Encuestas"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr "Informe de análisis de encuestas"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr "Preguntas de las encuestas"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr "Cambiar a borrador"
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo inválido en la definición de acción."
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Fecha de inicio"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Líneas histórico"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr "Cuerpo"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr "Responder la encuesta"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr "Todas las preguntas"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Fecha apertura de encuesta"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "encuesta.nombre.asist"
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr "Detalles usuarios"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Pregunta de la encuesta"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr "Establecer a uno si sólo necesita una respuesta por usuario"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Título de la página"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Histórico encuestas"
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr "Respuesta total"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Sus mensajes"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Permitir campo comentario"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr "¡ Advertencia !"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Enviar recordatorio para usuario existente"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr "Nueva pregunta de encuesta"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr "Saltar"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr "Límite respuesta máxima"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr "De"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveing. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index b57a67514ea..7b925ea1b53 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -13,10 +13,6 @@
 "access_survey_response_user","survey.response","model_survey_response","group_survey_user",1,1,1,1
 "access_survey_response_answer_manager","survey.response.answer","model_survey_response_answer","group_survey_manager",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer","model_survey_response_answer","group_survey_user",1,1,1,1
-"access_survey_name_wiz_manager","survey.name.wiz","model_survey_name_wiz","group_survey_manager",1,1,1,1
-"access_survey_name_wiz_user","survey.name.wiz","model_survey_name_wiz","group_survey_user",1,0,0,0
-"access_survey_question_wiz_manager","survey.question.wiz","model_survey_question_wiz","group_survey_manager",1,1,1,1
-"access_survey_question_wiz_user","survey.question.wiz","model_survey_question_wiz","group_survey_user",1,0,0,0
 "access_survey_history","survey.history","model_survey_history","group_survey_user",1,1,1,0
 "access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_manager",1,1,1,1
 "access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_user",1,0,0,0
@@ -26,15 +22,3 @@
 "access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_manager",1,1,1,1
 "access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_print_answer","survey.print.answer","model_survey_print_answer","group_survey_manager",1,1,1,1
-"access_survey_print_answer","survey.print.answer","model_survey_print_answer","group_survey_user",1,1,1,1
-"access_survey_send_invitation","survey.send.invitation","model_survey_send_invitation","group_survey_manager",1,1,1,1
-"access_survey_send_invitation","survey.send.invitation","model_survey_send_invitation","group_survey_user",1,0,0,0
-"access_survey_send_invitation_log","survey.send.invitation.log","model_survey_send_invitation_log","group_survey_manager",1,1,1,1
-"access_survey_send_invitation_log","survey.send.invitation.log","model_survey_send_invitation_log","group_survey_user",1,0,0,0
-"access_survey_print_statistics","survey.print.statistics","model_survey_print_statistics","group_survey_manager",1,1,1,1
-"access_survey_print_statistics","survey.print.statistics","model_survey_print_statistics","group_survey_user",1,0,0,0
-"access_survey_browse_answer","survey.browse.answer","model_survey_browse_answer","group_survey_manager",1,1,1,1
-"access_survey_browse_answer","survey.browse.answer","model_survey_browse_answer","group_survey_user",1,0,0,0
-"access_survey_print","survey.print","model_survey_print","group_survey_manager",1,1,1,1
-"access_survey_print","survey.print","model_survey_print","group_survey_user",1,0,0,0
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index edad2ac1add..db2eb1073d9 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
-			Survey Question Wizard 
+			Survey Question Wizard
 		 -->
-		 
+
 		<record id="view_survey_question_message" model="ir.ui.view">
 			<field name="name">Survey Question</field>
 			<field name="model">survey.question.wiz</field>
@@ -28,8 +28,7 @@
 			</field>
 		</record>
 
-		<record id="action_view_survey_question_message"
-			model="ir.actions.act_window">
+		<record id="action_view_survey_question_message" model="ir.actions.act_window">
 			<field name="name">Survey Question</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">survey.question.wiz</field>
@@ -38,6 +37,6 @@
 			<field name="target">new</field>
 		</record>
 
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index f91a4e29737..08ed6dd5262 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -1,219 +1,219 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-##############################################################################
-#
-# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import time
-import ir
-from osv import osv,fields
-import base64
-import netsvc
-from tools.translate import _
-
-class tinythunderbird_partner(osv.osv):
-
-    def _links_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.request.link')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context)
-
-        return [(r['object'], r['name']) for r in res]
-
-    _name = "tinythunderbird.partner"
-    _description="Thunderbid mails"
-    _rec_name="sender"
-    _columns = {
-                'sender':fields.char("Sender",size=128,required=True,select=True),
-                'receiver':fields.text("Receiver"),
-                "copy_to":fields.text("Copy To"),
-                "date":fields.date("Date",select=True),
-                "title":fields.char("Subject",size=128,select=True),
-                "description":fields.text("Description"),
-                "reference":fields.reference("Reference", selection=_links_get, size=128),
-                "res_user_id":fields.many2one("res.users","User"),
-                "attachments":fields.text("Attached Files",readonly=True),
-                }
-    _defaults = {
-                 'res_user_id':lambda obj,cr,uid,context: uid,
-                 'date': lambda *a: time.strftime('%Y-%m-%d')
-                 }
-
-    def thunderbird_mailcreate(self,cr,user,vals):
-        dictcreate = dict(vals)
-        import email
-        header_name = email.Header.decode_header(dictcreate['name'])
-        dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
-        add_obj=self.pool.get('res.partner.address')
-        case_pool=self.pool.get(dictcreate.get('object','crm.case'))
-        partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
-        partner=add_obj.read(cr,user,partner_ids,['partner_id'])
-        if partner and partner[0] and partner[0]['partner_id']:
-            dictcreate.update({'partner_id':partner[0]['partner_id'][0]})
-        create_id = case_pool.create(cr, user, dictcreate)
-        cases=case_pool.browse(cr,user,[create_id])
-        case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
-        return create_id
-
-    def thunderbird_createcontact(self,cr,user,vals):
-        dictcreate = dict(vals)
-        create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
-        return create_id
-
-    def thunderbird_createpartner(self,cr,user,vals):
-        dictcreate = dict(vals)
-        address_obj = self.pool.get('res.partner')
-        search_id = address_obj.search(cr, user,[('name','=',dictcreate['name'])])
-        if search_id:
-            return 0
-        create_id = address_obj.create(cr, user, dictcreate)
-        return create_id
-
-    def thunderbird_searchobject(self,cr,user,vals):
-        dictcreate = dict(vals)
-        search_id = self.pool.get('ir.model').search(cr, user,[('model','=',dictcreate['model'])])
-        return (search_id and search_id[0]) or 0
-
-    def thunderbird_searchcontact(self,cr,user,vals):
-        address_obj = self.pool.get('res.partner.address')
-        search_id1 = address_obj.search(cr,user,[('name','ilike',vals)])
-        search_id2 = address_obj.search(cr,user,[('email','=',vals)])
-        if search_id1:
-            return address_obj.name_get(cr, user, search_id1)
-        elif search_id2:
-            return address_obj.name_get(cr, user, search_id2)
-        return []
-
-    def thunderbird_tempsearch(self,cr,user,vals):
-        if vals[0]:
-            value = vals[0][0]
-        if vals[1]:
-            obj = vals[1];
-        name_get=[]
-        er_val=[]
-        for object in obj:
-            dyn_object = self.pool.get(object)
-            if object == 'res.partner.address':
-                search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
-                search_id2 = dyn_object.search(cr,user,[('email','=',value)])
-                if search_id1:
-                    name_get.append(object)
-                    name_get.append(dyn_object.name_get(cr, user, search_id1))
-                elif search_id2:
-                    name_get.append(object)
-                    name_get.append(dyn_object.name_get(cr, user, search_id2))
-            else:
-                try:
-                    search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
-                    if search_id1:
-                        name_get.append(object)
-                        name_get.append(dyn_object.name_get(cr, user, search_id1))
-                except:
-                    er_val.append(object)
-                    continue
-        if len(er_val) > 0:
-            name_get.append('error')
-            name_get.append(er_val)
-        return name_get
-
-    def thunderbird_attachment(self,cr,user,vals):
-        dictcreate = dict(vals)
-        datas = [dictcreate['datas']]
-        name = [dictcreate['name']]
-        f_name = [dictcreate['datas_fname']]
-        if(dictcreate['datas'].__contains__(',')):
-            name = dictcreate['name'].split(',')
-            datas = dictcreate['datas'].split(',')
-            f_name = dictcreate['datas_fname'].split(',')
-        for i in range(0,datas.__len__()):
-            dictcreate['name'] = name[i]
-            dictcreate['datas'] = datas[i]
-            dictcreate['datas_fname'] = f_name[i]
-            create_id = self.pool.get('ir.attachment').create(cr,user,dictcreate)
-        return 0
-
-    def thunderbird_login(self,cr,user,vals):
-        dictcreate = dict(vals)
-        service = netsvc.LocalService('common')
-        res = service.login(dictcreate['db'],dictcreate['login'],dictcreate['passwd'])
-        return res or 0
-
-    def read(self, cr, user, ids, fields=None, context={}, load='_classic_read'):
-         ret_read = super(tinythunderbird_partner, self).read(cr, user, ids,fields,context,load)
-         attach_obj = self.pool.get('ir.attachment')
-         for read_data in ret_read:
-             attachments = attach_obj.search(cr,user,[('res_model','=',self._name),('res_id','=',read_data['id'])])
-             attechments_data = sattach_obj.read(cr,user,attachments,['name'])
-             file_names = [a['name'] for a in attechments_data]
-             text_atteched = '\n'.join(file_names)
-             read_data['attachments'] = text_atteched
-         return ret_read
-
-    def unlink(self, cr, uid, ids, context={}):
-        attach_obj = self.pool.get('ir.attachment')
-        attachments = attach_obj.search(cr,uid,[('res_model','=',self._name),('res_id','in',ids)])
-        attach_obj.unlink(cr,uid,attachments)
-        return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context)
-
-    def thunderbird_objectsearch(self,cr,user,vals):
-        obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Metting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')]
-        object=[]
-        model_obj = self.pool.get('ir.model')
-        for obj in obj_list:
-            if model_obj.search(cr, user, [('model', '=', obj[0])]):
-                object.append(obj)
-        return object
-
-    def thunderbird_list_search_object(self,cr,user,vals):
-        model_obj = self.pool.get('ir.model')
-        object=''
-        for obj in vals[0][1].split(','):
-            if model_obj.search(cr, user, [('model', '=', obj)]):
-                object += obj + ","
-            else:
-                object += "null,"
-        return object
-
-tinythunderbird_partner()
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+##############################################################################
+#
+# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import time
+import ir
+from osv import osv,fields
+import base64
+import netsvc
+from tools.translate import _
+
+class tinythunderbird_partner(osv.osv):
+
+    def _links_get(self, cr, uid, context={}):
+        obj = self.pool.get('res.request.link')
+        ids = obj.search(cr, uid, [])
+        res = obj.read(cr, uid, ids, ['object', 'name'], context)
+
+        return [(r['object'], r['name']) for r in res]
+
+    _name = "tinythunderbird.partner"
+    _description="Thunderbid mails"
+    _rec_name="sender"
+    _columns = {
+                'sender':fields.char("Sender",size=128,required=True,select=True),
+                'receiver':fields.text("Receiver"),
+                "copy_to":fields.text("Copy To"),
+                "date":fields.date("Date",select=True),
+                "title":fields.char("Subject",size=128,select=True),
+                "description":fields.text("Description"),
+                "reference":fields.reference("Reference", selection=_links_get, size=128),
+                "res_user_id":fields.many2one("res.users","User"),
+                "attachments":fields.text("Attached Files",readonly=True),
+                }
+    _defaults = {
+                 'res_user_id':lambda obj,cr,uid,context: uid,
+                 'date': lambda *a: time.strftime('%Y-%m-%d')
+                 }
+
+    def thunderbird_mailcreate(self,cr,user,vals):
+        dictcreate = dict(vals)
+        import email
+        header_name = email.Header.decode_header(dictcreate['name'])
+        dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
+        add_obj=self.pool.get('res.partner.address')
+        case_pool=self.pool.get(dictcreate.get('object','crm.case'))
+        partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
+        partner=add_obj.read(cr,user,partner_ids,['partner_id'])
+        if partner and partner[0] and partner[0]['partner_id']:
+            dictcreate.update({'partner_id':partner[0]['partner_id'][0]})
+        create_id = case_pool.create(cr, user, dictcreate)
+        cases=case_pool.browse(cr,user,[create_id])
+        case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
+        return create_id
+
+    def thunderbird_createcontact(self,cr,user,vals):
+        dictcreate = dict(vals)
+        create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
+        return create_id
+
+    def thunderbird_createpartner(self,cr,user,vals):
+        dictcreate = dict(vals)
+        address_obj = self.pool.get('res.partner')
+        search_id = address_obj.search(cr, user,[('name','=',dictcreate['name'])])
+        if search_id:
+            return 0
+        create_id = address_obj.create(cr, user, dictcreate)
+        return create_id
+
+    def thunderbird_searchobject(self,cr,user,vals):
+        dictcreate = dict(vals)
+        search_id = self.pool.get('ir.model').search(cr, user,[('model','=',dictcreate['model'])])
+        return (search_id and search_id[0]) or 0
+
+    def thunderbird_searchcontact(self,cr,user,vals):
+        address_obj = self.pool.get('res.partner.address')
+        search_id1 = address_obj.search(cr,user,[('name','ilike',vals)])
+        search_id2 = address_obj.search(cr,user,[('email','=',vals)])
+        if search_id1:
+            return address_obj.name_get(cr, user, search_id1)
+        elif search_id2:
+            return address_obj.name_get(cr, user, search_id2)
+        return []
+
+    def thunderbird_tempsearch(self,cr,user,vals):
+        if vals[0]:
+            value = vals[0][0]
+        if vals[1]:
+            obj = vals[1];
+        name_get=[]
+        er_val=[]
+        for object in obj:
+            dyn_object = self.pool.get(object)
+            if object == 'res.partner.address':
+                search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
+                search_id2 = dyn_object.search(cr,user,[('email','=',value)])
+                if search_id1:
+                    name_get.append(object)
+                    name_get.append(dyn_object.name_get(cr, user, search_id1))
+                elif search_id2:
+                    name_get.append(object)
+                    name_get.append(dyn_object.name_get(cr, user, search_id2))
+            else:
+                try:
+                    search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
+                    if search_id1:
+                        name_get.append(object)
+                        name_get.append(dyn_object.name_get(cr, user, search_id1))
+                except:
+                    er_val.append(object)
+                    continue
+        if len(er_val) > 0:
+            name_get.append('error')
+            name_get.append(er_val)
+        return name_get
+
+    def thunderbird_attachment(self,cr,user,vals):
+        dictcreate = dict(vals)
+        datas = [dictcreate['datas']]
+        name = [dictcreate['name']]
+        f_name = [dictcreate['datas_fname']]
+        if(dictcreate['datas'].__contains__(',')):
+            name = dictcreate['name'].split(',')
+            datas = dictcreate['datas'].split(',')
+            f_name = dictcreate['datas_fname'].split(',')
+        for i in range(0,datas.__len__()):
+            dictcreate['name'] = name[i]
+            dictcreate['datas'] = datas[i]
+            dictcreate['datas_fname'] = f_name[i]
+            create_id = self.pool.get('ir.attachment').create(cr,user,dictcreate)
+        return 0
+
+    def thunderbird_login(self,cr,user,vals):
+        dictcreate = dict(vals)
+        service = netsvc.LocalService('common')
+        res = service.login(dictcreate['db'],dictcreate['login'],dictcreate['passwd'])
+        return res or 0
+
+    def read(self, cr, user, ids, fields=None, context={}, load='_classic_read'):
+         ret_read = super(tinythunderbird_partner, self).read(cr, user, ids,fields,context,load)
+         attach_obj = self.pool.get('ir.attachment')
+         for read_data in ret_read:
+             attachments = attach_obj.search(cr,user,[('res_model','=',self._name),('res_id','=',read_data['id'])])
+             attechments_data = sattach_obj.read(cr,user,attachments,['name'])
+             file_names = [a['name'] for a in attechments_data]
+             text_atteched = '\n'.join(file_names)
+             read_data['attachments'] = text_atteched
+         return ret_read
+
+    def unlink(self, cr, uid, ids, context={}):
+        attach_obj = self.pool.get('ir.attachment')
+        attachments = attach_obj.search(cr,uid,[('res_model','=',self._name),('res_id','in',ids)])
+        attach_obj.unlink(cr,uid,attachments)
+        return super(tinythunderbird_partner, self).unlink(cr, uid, ids,context)
+
+    def thunderbird_objectsearch(self,cr,user,vals):
+        obj_list= [('crm.claim', 'Claim'), ('crm.lead','Lead'), ('crm.meeting','Metting'), ('crm.opportunity','Opportunity'), ('crm.phonecall','Phonecall'), ('crm.fundraising','Fund raising'), ('crm.helpdesk','Helpdesk')]
+        object=[]
+        model_obj = self.pool.get('ir.model')
+        for obj in obj_list:
+            if model_obj.search(cr, user, [('model', '=', obj[0])]):
+                object.append(obj)
+        return object
+
+    def thunderbird_list_search_object(self,cr,user,vals):
+        model_obj = self.pool.get('ir.model')
+        object=''
+        for obj in vals[0][1].split(','):
+            if model_obj.search(cr, user, [('model', '=', obj)]):
+                object += obj + ","
+            else:
+                object += "null,"
+        return object
+
+tinythunderbird_partner()
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index 52f5efbcb7f..f5b3247103c 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_tinythunderbird_partner","tinythunderbird.partner","model_tinythunderbird_partner",,1,1,1,1
-"access_thunderbird_installer","thunderbird.installer","model_thunderbird_installer","base.group_system",1,1,1,1
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 8dd7779a290..074c44b0a87 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -24,13 +24,13 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """
-    The base module to manage documents(wiki)
+The base module to manage documents(wiki)
 
-    keep track for the wiki groups, pages, and history
+keep track for the wiki groups, pages, and history
     """,
     'author': 'Tiny & Axelor',
     'website': 'http://openerp.com',
-    'depends': ['base'],
+    'depends': ['knowledge'],
     'init_xml': [],
     'update_xml': [
         'wizard/wiki_wiki_page_open_view.xml',
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 14ee1c656db..67c7bf7b4c3 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -5,7 +5,3 @@
 "wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
 "wiki_groups_link","wiki.groups.link","model_wiki_groups_link","base.group_system",1,1,1,1
 "wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
-"wiki_wizard_wiki_history_show_diff","wizard.wiki.history.show_diff","model_wizard_wiki_history_show_diff","base.group_user",1,1,1,1
-"wiki_wiki_page_open","wiki.wiki.page.open","model_wiki_wiki_page_open","base.group_user",1,1,1,1
-"wiki_create_menu","wiki.create.menu","model_wiki_create_menu","base.group_user",1,1,1,1
-"wiki_make_index","wiki.make.index","model_wiki_make_index","base.group_user",1,1,1,1
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index a9b623611b8..3fe9d25fcc5 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -32,7 +32,6 @@ import difflib
 
 class Wiki(osv.osv):
     """ wiki """
-
     _name = "wiki.wiki"
 
 Wiki()
@@ -78,7 +77,7 @@ class GroupLink(osv.osv):
 GroupLink()
 
 
-class Wiki(osv.osv):
+class Wiki2(osv.osv):
     """ Wiki Page """
 
     _inherit = "wiki.wiki"
@@ -87,19 +86,22 @@ class Wiki(osv.osv):
 
     _columns = {
         'name': fields.char('Title', size=256, select=True, required=True),
-        'write_uid': fields.many2one('res.users', "Last Author"),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
         'text_area': fields.text("Content"),
         'create_uid': fields.many2one('res.users', 'Author', select=True),
         'create_date': fields.datetime("Created on", select=True),
         'write_date': fields.datetime("Modification Date", select=True),
-        'tags': fields.char('Tags', size=1024),
+        'tags': fields.char('Tags', size=1024, select=True),
         'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
         'minor_edit': fields.boolean('Minor edit', select=True),
         'summary': fields.char('Summary', size=256),
-        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
-        'toc': fields.boolean('Table of Contents'),
-        'review': fields.boolean('Need Review'),
+        'section': fields.char('Section', size=32, help="Use page section code like 1.2.1", select=True),
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null', 
+            help="Topic, also called Wiki Group"),
+        'toc': fields.boolean('Table of Contents', 
+            help="Indicates that this pages is a table of contents (linking to other pages)"),
+        'review': fields.boolean('Needs Review', select=True, 
+            help="Indicates that this page should be reviewed, raising the attention of other contributors"),
         'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
@@ -176,29 +178,7 @@ class Wiki(osv.osv):
                 history.create(cr, uid, res)
         return result
 
-    def open_wiki_page(self, cr, uid, ids, context):
-
-        """ Opens Wiki Page for Editing
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of wiki page’s IDs
-
-        """
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-        if not pages:
-           raise osv.except_osv(_('Warning !'), _("No Help page is defined"))
-        value = {
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'res_id': pages[0],
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-        }
-        return value
-
-Wiki()
+Wiki2()
 
 
 class History(osv.osv):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 189122ea617..5a0a3d557bf 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge Management" icon="terp-stock"
-           id="base.menu_document" sequence="19" />
+       <menuitem name="Knowledge" icon="terp-stock"
+           id="knowledge.menu_document" sequence="19" />
 
        <menuitem name="Configuration"
-           id="base.menu_document_configuration"
-           parent="base.menu_document" sequence="50" />
+           id="knowledge.menu_document_configuration"
+           parent="knowledge.menu_document" sequence="50" />
 
        <menuitem name="Wiki" id="menu_wiki_configuration"
-           parent="base.menu_document_configuration" sequence="2" />
+           parent="knowledge.menu_document_configuration" sequence="2" />
 
-       <menuitem id="base.menu_document2" name="Collaborative Content"
-           parent="base.menu_document" />
 
 <!--  Wiki Groups Tree view -->
 
@@ -125,18 +123,13 @@
             <field name="arch" type="xml">
                 <form string="Wiki">
                     <group col="8" colspan="4">
-                        <field name="name" select="1" colspan="6"/>
-                        <button name="open_wiki_page" type="object"
-                        string="Basic Wiki Editing" icon="gtk-ok" />
-                    </group>
-                    <group col="8" colspan="4">
+                        <field name="name" select="1" colspan="8"/>
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
                         <field name="section" invisible="not context.get('section',False)"/>
-<!--                        <field name="parent_id"/>-->
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
-                        <separator colspan="4" string="Informations"/>
+                        <separator colspan="4" string="Page Content"/>
                         <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                         </page>
                     </notebook>
@@ -146,7 +139,6 @@
                         <field name="review" select="1"/>
                         <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="toc"/>
-<!--                        <field name="summary" colspan="4" groups="base.group_extended"/>-->
                     </group>
                 </form>
             </field>
@@ -167,12 +159,11 @@
                     <field name="group_id" select="1"/>
                     <field name="write_uid" select="1"/>
                     <field name="write_date" select="1"/>
-                    <field name="review" select="1"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
                         <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal-" string="Last Author" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter icon="terp-personal-" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
                     </group>
                 </search>
             </field>
@@ -186,11 +177,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
-<!--            <field name="context">{'section':'1','search_default_create_uid':uid}</field>-->
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
 
-        <menuitem parent="base.menu_document2"
+        <menuitem parent="knowledge.menu_document2"
             id="menu_action_wiki_wiki" name="Wiki Pages"
             action="action_wiki" />
 
diff --git a/addons/wiki_faq/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
index fdb93660682..1926efd33f7 100644
--- a/addons/wiki_faq/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -9,9 +9,11 @@
 
 == Answer ==
 
+
+
 == External Links ==
 
-            </field>
+</field>
         </record>
         <record id="wiki_wiki_bugs" model="wiki.wiki">
             <field name="name">Bug Tracker ?</field>
@@ -48,8 +50,7 @@ Integration Benefits:
 
 * The Open ERP Website: [http://openerp.com]
 * The DMS Documentation: [http://openerp.com]
-
-            </field>
+</field>
         </record>
         <record id="wiki_wiki_dms" model="wiki.wiki">
             <field name="name">Document Management System ?</field>
@@ -88,8 +89,7 @@ Integration Benefits:
 
 * The Open ERP Website : [http://openerp.com]
 * The DMS Documentation : [http://openerp.com]
-
-            </field>
+</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index 4a8eea1cb38..a349f77404f 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -14,11 +14,14 @@
             <field eval="2" name="section"/>
             <field name="template">== Question ==
 
+
 == Answer ==
 
+
+
 == External Links ==
 
-            </field>
+</field>
         </record>